From 54873e0309317cf371e707ad0223afd9d774e5c5 Mon Sep 17 00:00:00 2001 From: xiachao Date: Wed, 14 Aug 2024 09:26:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=96=99=E9=98=B6=E6=AE=B5=20?= =?UTF-8?q?=E7=A2=B3=E6=8E=92=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/CqcCarbonConsumablesDTO.java | 36 +++++++++---------- .../entity/CqcCarbonConsumablesEntity.java | 36 +++++++++---------- .../dto/CqcCarbonDiscardDTO.java | 36 +++++++++---------- .../entity/CqcCarbonDiscardEntity.java | 36 +++++++++---------- .../dto/CqcCarbonDistributionDTO.java | 24 ++++++------- .../entity/CqcCarbonDistributionEntity.java | 24 ++++++------- .../dto/CqcCarbonEnergyDTO.java | 20 +++++------ .../entity/CqcCarbonEnergyEntity.java | 20 +++++------ .../cqcCarbonMake/dto/CqcCarbonMakeDTO.java | 18 +++++----- .../entity/CqcCarbonMakeEntity.java | 18 +++++----- 10 files changed, 134 insertions(+), 134 deletions(-) diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java index 200a4c5..2b5e674 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java @@ -23,39 +23,39 @@ public class CqcCarbonConsumablesDTO implements Serializable { @Schema(description = "申请编号") private String applyNo; @Schema(description = "类别") - private String cateid; + private String cateId; @Schema(description = "中文名称") - private String materialsnamecn; + private String materialsNameCn; @Schema(description = "化学名称") - private String materialsnameen; + private String materialsNameEn; @Schema(description = "用途") - private String materialsuse; + private String materialsUse; @Schema(description = "材料组份") - private String materialcomponent; + private String materialComponent; @Schema(description = "产品使用耗材总投入量") - private String productcapacity; + private String productCapacity; @Schema(description = "单位") - private String productcapacityunit; + private String productCapacityUnit; @Schema(description = "功能单位耗用量") - private String rawmaterialsinput; + private String rawMaterialsInput; @Schema(description = "单位") - private String rawmaterialsunit; + private String rawMaterialsUnit; @Schema(description = "供货商名称") - private String suppliername; + private String supplierName; @Schema(description = "供货商地址") - private String supplieraddress; + private String supplierAddress; @Schema(description = "运输方式") - private String transmode; + private String transMode; @Schema(description = "运输工具载重量") - private String transloadcapacity; + private String transLoadCapacity; @Schema(description = "运输距离") - private String transdistance; + private String transDistance; @Schema(description = "单位") - private String transdistanceunit; + private String transDistanceUnit; @Schema(description = "运输数据来源") - private String transdatasource; + private String transDataSource; @Schema(description = "活动数据来源") - private String activitydatasource; + private String activityDataSource; @Schema(description = "部门") private String dept; @Schema(description = "人员") @@ -65,6 +65,6 @@ public class CqcCarbonConsumablesDTO implements Serializable { @Schema(description = "备注") private String remake; @Schema(description = "能源编号") - private String energyno; + private String energyNo; } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java index 5990ef9..07f5376 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java @@ -35,71 +35,71 @@ public class CqcCarbonConsumablesEntity implements Serializable { /** * 类别 */ - private String cateid; + private String cateId; /** * 中文名称 */ - private String materialsnamecn; + private String materialsNameCn; /** * 化学名称 */ - private String materialsnameen; + private String materialsNameEn; /** * 用途 */ - private String materialsuse; + private String materialsUse; /** * 材料组份 */ - private String materialcomponent; + private String materialComponent; /** * 产品使用耗材总投入量 */ - private String productcapacity; + private String productCapacity; /** * 单位 */ - private String productcapacityunit; + private String productCapacityUnit; /** * 功能单位耗用量 */ - private String rawmaterialsinput; + private String rawMaterialsInput; /** * 单位 */ - private String rawmaterialsunit; + private String rawMaterialsUnit; /** * 供货商名称 */ - private String suppliername; + private String supplierName; /** * 供货商地址 */ - private String supplieraddress; + private String supplierAddress; /** * 运输方式 */ - private String transmode; + private String transMode; /** * 运输工具载重量 */ - private String transloadcapacity; + private String transLoadCapacity; /** * 运输距离 */ - private String transdistance; + private String transDistance; /** * 单位 */ - private String transdistanceunit; + private String transDistanceUnit; /** * 运输数据来源 */ - private String transdatasource; + private String transDataSource; /** * 活动数据来源 */ - private String activitydatasource; + private String activityDataSource; /** * 部门 */ @@ -119,5 +119,5 @@ public class CqcCarbonConsumablesEntity implements Serializable { /** * 能源编号 */ - private String energyno; + private String energyNo; } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java index 0777019..c688648 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java @@ -23,39 +23,39 @@ public class CqcCarbonDiscardDTO implements Serializable { @Schema(description = "申请编号") private String applyNo; @Schema(description = "类别") - private String cateid; + private String cateId; @Schema(description = "中文名称") - private String materialsnamecn; + private String materialsNameCn; @Schema(description = "化学名称") - private String materialsnameen; + private String materialsNameEn; @Schema(description = "材料组份") - private String materialcomponent; + private String materialComponent; @Schema(description = "废物处置材料总重量") - private String wastedisposal; + private String wasteDisposal; @Schema(description = "单位") - private String wastedisposalunit; + private String wasteDisposalUnit; @Schema(description = "功能单位处置量") - private String rawmaterialsinput; + private String rawMaterialsInput; @Schema(description = "单位") - private String rawmaterialsunit; + private String rawMaterialsUnit; @Schema(description = "处理方式") - private String disposeway; + private String disposeWay; @Schema(description = "处理商名称") - private String disposename; + private String disposeName; @Schema(description = "处理商地址") - private String disposeaddress; + private String disposeAddress; @Schema(description = "运输方式") - private String transmode; + private String transMode; @Schema(description = "运输工具载重量") - private String transloadcapacity; + private String transLoadCapacity; @Schema(description = "运输距离") - private String transdistance; + private String transDistance; @Schema(description = "单位") - private String transdistanceunit; + private String transDistanceUnit; @Schema(description = "运输数据来源") - private String transdatasource; + private String transDataSource; @Schema(description = "活动数据来源") - private String activitydatasource; + private String activityDataSource; @Schema(description = "部门") private String dept; @Schema(description = "人员") @@ -65,6 +65,6 @@ public class CqcCarbonDiscardDTO implements Serializable { @Schema(description = "备注") private String remake; @Schema(description = "编号") - private String wasteno; + private String wasteNo; } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java index d3b0193..158a89d 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java @@ -36,71 +36,71 @@ public class CqcCarbonDiscardEntity implements Serializable { /** * 类别 */ - private String cateid; + private String cateId; /** * 中文名称 */ - private String materialsnamecn; + private String materialsNameCn; /** * 化学名称 */ - private String materialsnameen; + private String materialsNameEn; /** * 材料组份 */ - private String materialcomponent; + private String materialComponent; /** * 废物处置材料总重量 */ - private String wastedisposal; + private String wasteDisposal; /** * 单位 */ - private String wastedisposalunit; + private String wasteDisposalUnit; /** * 功能单位处置量 */ - private String rawmaterialsinput; + private String rawMaterialsInput; /** * 单位 */ - private String rawmaterialsunit; + private String rawMaterialsUnit; /** * 处理方式 */ - private String disposeway; + private String disposeWay; /** * 处理商名称 */ - private String disposename; + private String disposeName; /** * 处理商地址 */ - private String disposeaddress; + private String disposeAddress; /** * 运输方式 */ - private String transmode; + private String transMode; /** * 运输工具载重量 */ - private String transloadcapacity; + private String transLoadCapacity; /** * 运输距离 */ - private String transdistance; + private String transDistance; /** * 单位 */ - private String transdistanceunit; + private String transDistanceUnit; /** * 运输数据来源 */ - private String transdatasource; + private String transDataSource; /** * 活动数据来源 */ - private String activitydatasource; + private String activityDataSource; /** * 部门 */ @@ -120,5 +120,5 @@ public class CqcCarbonDiscardEntity implements Serializable { /** * 编号 */ - private String wasteno; + private String wasteNo; } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java index 57116a1..e3cb9b6 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java @@ -23,27 +23,27 @@ public class CqcCarbonDistributionDTO implements Serializable { @Schema(description = "申请编号") private String applyNo; @Schema(description = "中文名称") - private String materialsnamecn; + private String materialsNameCn; @Schema(description = "产品出货重量") - private String productweight; + private String productWeight; @Schema(description = "单位") - private String productweightunit; + private String productWeightUnit; @Schema(description = "分销对象") - private String distributionobject; + private String distributionObject; @Schema(description = "分销地址") - private String distributionaddress; + private String distributionAddress; @Schema(description = "运输方式") - private String transmode; + private String transMode; @Schema(description = "运输工具载重量") - private String transloadcapacity; + private String transLoadCapacity; @Schema(description = "运输距离") - private String transdistance; + private String transDistance; @Schema(description = "单位") - private String transdistanceunit; + private String transDistanceUnit; @Schema(description = "运输数据来源") - private String transdatasource; + private String transDataSource; @Schema(description = "活动数据来源") - private String activitydatasource; + private String activityDataSource; @Schema(description = "部门") private String dept; @Schema(description = "人员") @@ -53,6 +53,6 @@ public class CqcCarbonDistributionDTO implements Serializable { @Schema(description = "备注") private String remake; @Schema(description = "编号") - private String disno; + private String disNo; } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java index 926d7a5..c9e254d 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java @@ -35,47 +35,47 @@ public class CqcCarbonDistributionEntity implements Serializable { /** * 中文名称 */ - private String materialsnamecn; + private String materialsNameCn; /** * 产品出货重量 */ - private String productweight; + private String productWeight; /** * 单位 */ - private String productweightunit; + private String productWeightUnit; /** * 分销对象 */ - private String distributionobject; + private String distributionObject; /** * 分销地址 */ - private String distributionaddress; + private String distributionAddress; /** * 运输方式 */ - private String transmode; + private String transMode; /** * 运输工具载重量 */ - private String transloadcapacity; + private String transLoadCapacity; /** * 运输距离 */ - private String transdistance; + private String transDistance; /** * 单位 */ - private String transdistanceunit; + private String transDistanceUnit; /** * 运输数据来源 */ - private String transdatasource; + private String transDataSource; /** * 活动数据来源 */ - private String activitydatasource; + private String activityDataSource; /** * 部门 */ @@ -95,5 +95,5 @@ public class CqcCarbonDistributionEntity implements Serializable { /** * 编号 */ - private String disno; + private String disNo; } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java index 9b73dc0..eff2f80 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java @@ -24,23 +24,23 @@ public class CqcCarbonEnergyDTO implements Serializable { @Schema(description = "申请编号") private String applyNo; @Schema(description = "类别") - private String cateid; + private String cateId; @Schema(description = "使用过程") - private String useprocedure; + private String useProcedure; @Schema(description = "排放源") - private String emissionsource; + private String emissionSource; @Schema(description = "用途") - private String materialsuse; + private String materialsUse; @Schema(description = "产品使用能源总投入量") - private String energycapacity; + private String energyCapacity; @Schema(description = "单位") - private String energycapacityunit; + private String energyCapacityUnit; @Schema(description = "功能单位耗用量") - private String rawmaterialsinput; + private String rawMaterialsInput; @Schema(description = "单位") - private String rawmaterialsunit; + private String rawMaterialsUnit; @Schema(description = "活动数据来源") - private String activitydatasource; + private String activityDataSource; @Schema(description = "部门") private String dept; @Schema(description = "人员") @@ -50,6 +50,6 @@ public class CqcCarbonEnergyDTO implements Serializable { @Schema(description = "备注") private String remake; @Schema(description = "备注") - private String consumeno; + private String consumeNo; } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java index 4803121..2964d57 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java @@ -36,39 +36,39 @@ public class CqcCarbonEnergyEntity implements Serializable { /** * 类别 */ - private String cateid; + private String cateId; /** * 使用过程 */ - private String useprocedure; + private String useProcedure; /** * 排放源 */ - private String emissionsource; + private String emissionSource; /** * 用途 */ - private String materialsuse; + private String materialsUse; /** * 产品使用能源总投入量 */ - private String energycapacity; + private String energyCapacity; /** * 单位 */ - private String energycapacityunit; + private String energyCapacityUnit; /** * 功能单位耗用量 */ - private String rawmaterialsinput; + private String rawMaterialsInput; /** * 单位 */ - private String rawmaterialsunit; + private String rawMaterialsUnit; /** * 活动数据来源 */ - private String activitydatasource; + private String activityDataSource; /** * 部门 */ @@ -88,5 +88,5 @@ public class CqcCarbonEnergyEntity implements Serializable { /** * 备注 */ - private String consumeno; + private String consumeNo; } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java index 2da0c61..cc1be6f 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/dto/CqcCarbonMakeDTO.java @@ -24,21 +24,21 @@ public class CqcCarbonMakeDTO implements Serializable { @Schema(description = "申请编号,，关联申请记录表申请唯一编码") private String applyNo; @Schema(description = "类别") - private String cateid; + private String cateId; @Schema(description = "制程投入位置") - private String useplace; + private String usePlace; @Schema(description = "排放源") - private String emissionsource; + private String emissionSource; @Schema(description = "全厂总用量") - private String totalelectricity; + private String totalElectricity; @Schema(description = "全厂总用量单位") - private String totalelectricityunit; + private String totalElectricityUnit; @Schema(description = "功能单位消耗量") - private String specificconsumption; + private String specificConsumption; @Schema(description = "消耗量单位") - private String specificconsumptionunit; + private String specificConsumptionUnit; @Schema(description = "活动数据来源") - private String activitydatasource; + private String activityDataSource; @Schema(description = "部门") private String dept; @Schema(description = "人员") @@ -48,6 +48,6 @@ public class CqcCarbonMakeDTO implements Serializable { @Schema(description = "备注") private String remake; @Schema(description = "编号") - private String makeno; + private String makeNo; } \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java index 5cba885..9b5ed87 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/entity/CqcCarbonMakeEntity.java @@ -36,35 +36,35 @@ public class CqcCarbonMakeEntity implements Serializable { /** * 类别 */ - private String cateid; + private String cateId; /** * 制程投入位置 */ - private String useplace; + private String usePlace; /** * 排放源 */ - private String emissionsource; + private String emissionSource; /** * 全厂总用量 */ - private String totalelectricity; + private String totalElectricity; /** * 全厂总用量单位 */ - private String totalelectricityunit; + private String totalElectricityUnit; /** * 功能单位消耗量 */ - private String specificconsumption; + private String specificConsumption; /** * 消耗量单位 */ - private String specificconsumptionunit; + private String specificConsumptionUnit; /** * 活动数据来源 */ - private String activitydatasource; + private String activityDataSource; /** * 部门 */ @@ -84,5 +84,5 @@ public class CqcCarbonMakeEntity implements Serializable { /** * 编号 */ - private String makeno; + private String makeNo; } \ No newline at end of file