diff --git a/application/pom.xml b/application/pom.xml
index 8d8fc4d..fe426e3 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -137,6 +137,10 @@
com.thing.modules
filter-rule
+
+ com.thing.modules
+ cqc-service
+
diff --git a/modules/cqc-service/pom.xml b/modules/cqc-service/pom.xml
new file mode 100644
index 0000000..2b95eb2
--- /dev/null
+++ b/modules/cqc-service/pom.xml
@@ -0,0 +1,31 @@
+
+ 4.0.0
+
+ com.thing
+ modules
+ 5.1
+
+
+ com.thing.modules
+ cqc-service
+ jar
+ ThingBI Server Modules cqc-service
+
+
+ UTF-8
+
+
+
+
+
+ org.projectlombok
+ lombok
+
+
+
+ com.thing.common
+ orm
+
+
+
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
new file mode 100644
index 0000000..5dc7a84
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
@@ -0,0 +1,98 @@
+package com.thing.cqc.CqcCarbonConsumables.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonConsumables.dto.CqcCarbonConsumablesDTO;
+import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+* 使用阶段耗材信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/cqccarbonconsumables")
+@Tag(name="使用阶段耗材信息")
+@RequiredArgsConstructor
+public class CqcCarbonConsumablesController {
+
+ private final CqcCarbonConsumablesService cqcCarbonConsumablesService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonConsumablesDTO data = cqcCarbonConsumablesService.getByIdAs(id, CqcCarbonConsumablesDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonConsumablesDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonConsumablesService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonConsumablesDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonConsumablesService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonConsumablesService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonConsumablesService.listAs(params, CqcCarbonConsumablesDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "使用阶段耗材信息", list, CqcCarbonConsumablesExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..4c7448f
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java
@@ -0,0 +1,71 @@
+package com.thing.cqc.CqcCarbonConsumables.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 使用阶段耗材信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "使用阶段耗材信息")
+public class CqcCarbonConsumablesDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号")
+ private String applyNo;
+ @Schema(description = "类别")
+ private String cateid;
+ @Schema(description = "中文名称")
+ private String materialsnamecn;
+ @Schema(description = "化学名称")
+ private String materialsnameen;
+ @Schema(description = "用途")
+ private String materialsuse;
+ @Schema(description = "材料组份")
+ private String materialcomponent;
+ @Schema(description = "产品使用耗材总投入量")
+ private String productcapacity;
+ @Schema(description = "单位")
+ private String productcapacityunit;
+ @Schema(description = "功能单位耗用量")
+ private String rawmaterialsinput;
+ @Schema(description = "单位")
+ private String rawmaterialsunit;
+ @Schema(description = "供货商名称")
+ private String suppliername;
+ @Schema(description = "供货商地址")
+ private String supplieraddress;
+ @Schema(description = "运输方式")
+ private String transmode;
+ @Schema(description = "运输工具载重量")
+ private String transloadcapacity;
+ @Schema(description = "运输距离")
+ private String transdistance;
+ @Schema(description = "单位")
+ private String transdistanceunit;
+ @Schema(description = "运输数据来源")
+ private String transdatasource;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "能源编号")
+ 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
new file mode 100644
index 0000000..460db88
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java
@@ -0,0 +1,122 @@
+package com.thing.cqc.CqcCarbonConsumables.entity;
+
+import com.mybatisflex.annotation.Table;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 使用阶段耗材信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_consumables")
+public class CqcCarbonConsumablesEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ private Long id;
+ /**
+ * 申请编号
+ */
+ private String applyNo;
+ /**
+ * 类别
+ */
+ private String cateid;
+ /**
+ * 中文名称
+ */
+ private String materialsnamecn;
+ /**
+ * 化学名称
+ */
+ private String materialsnameen;
+ /**
+ * 用途
+ */
+ private String materialsuse;
+ /**
+ * 材料组份
+ */
+ private String materialcomponent;
+ /**
+ * 产品使用耗材总投入量
+ */
+ private String productcapacity;
+ /**
+ * 单位
+ */
+ private String productcapacityunit;
+ /**
+ * 功能单位耗用量
+ */
+ private String rawmaterialsinput;
+ /**
+ * 单位
+ */
+ private String rawmaterialsunit;
+ /**
+ * 供货商名称
+ */
+ private String suppliername;
+ /**
+ * 供货商地址
+ */
+ private String supplieraddress;
+ /**
+ * 运输方式
+ */
+ private String transmode;
+ /**
+ * 运输工具载重量
+ */
+ private String transloadcapacity;
+ /**
+ * 运输距离
+ */
+ private String transdistance;
+ /**
+ * 单位
+ */
+ private String transdistanceunit;
+ /**
+ * 运输数据来源
+ */
+ private String transdatasource;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 能源编号
+ */
+ private String energyno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
new file mode 100644
index 0000000..1b27ac9
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonConsumables.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 使用阶段耗材信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonConsumablesMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java
new file mode 100644
index 0000000..a59ff6b
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonConsumables.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
+
+/**
+ * 使用阶段耗材信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonConsumablesService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
new file mode 100644
index 0000000..b436f41
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonConsumables.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper;
+import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
+import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 使用阶段耗材信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonConsumablesServiceImpl extends BaseServiceImpl implements CqcCarbonConsumablesService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java
new file mode 100644
index 0000000..99f76c7
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java
@@ -0,0 +1,98 @@
+package com.thing.cqc.CqcCarbonDiscard.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonDiscard.dto.CqcCarbonDiscardDTO;
+import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+* 废物处置及再利用信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/cqccarbondiscard")
+@Tag(name="废物处置及再利用信息")
+@RequiredArgsConstructor
+public class CqcCarbonDiscardController {
+
+ private final CqcCarbonDiscardService cqcCarbonDiscardService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonDiscardDTO data = cqcCarbonDiscardService.getByIdAs(id, CqcCarbonDiscardDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonDiscardDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonDiscardService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonDiscardDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonDiscardService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonDiscardService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonDiscardService.listAs(params, CqcCarbonDiscardDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "废物处置及再利用信息", list, CqcCarbonDiscardExcel.class);
+ *}
+ */
+
+}
\ 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
new file mode 100644
index 0000000..9027ac7
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java
@@ -0,0 +1,71 @@
+package com.thing.cqc.CqcCarbonDiscard.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 废物处置及再利用信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "废物处置及再利用信息")
+public class CqcCarbonDiscardDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号")
+ private String applyNo;
+ @Schema(description = "类别")
+ private String cateid;
+ @Schema(description = "中文名称")
+ private String materialsnamecn;
+ @Schema(description = "化学名称")
+ private String materialsnameen;
+ @Schema(description = "材料组份")
+ private String materialcomponent;
+ @Schema(description = "废物处置材料总重量")
+ private String wastedisposal;
+ @Schema(description = "单位")
+ private String wastedisposalunit;
+ @Schema(description = "功能单位处置量")
+ private String rawmaterialsinput;
+ @Schema(description = "单位")
+ private String rawmaterialsunit;
+ @Schema(description = "处理方式")
+ private String disposeway;
+ @Schema(description = "处理商名称")
+ private String disposename;
+ @Schema(description = "处理商地址")
+ private String disposeaddress;
+ @Schema(description = "运输方式")
+ private String transmode;
+ @Schema(description = "运输工具载重量")
+ private String transloadcapacity;
+ @Schema(description = "运输距离")
+ private String transdistance;
+ @Schema(description = "单位")
+ private String transdistanceunit;
+ @Schema(description = "运输数据来源")
+ private String transdatasource;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "编号")
+ 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
new file mode 100644
index 0000000..254243d
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java
@@ -0,0 +1,123 @@
+package com.thing.cqc.CqcCarbonDiscard.entity;
+
+import com.mybatisflex.annotation.Table;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 废物处置及再利用信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_discard")
+public class CqcCarbonDiscardEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请编号
+ */
+ private String applyNo;
+ /**
+ * 类别
+ */
+ private String cateid;
+ /**
+ * 中文名称
+ */
+ private String materialsnamecn;
+ /**
+ * 化学名称
+ */
+ private String materialsnameen;
+ /**
+ * 材料组份
+ */
+ private String materialcomponent;
+ /**
+ * 废物处置材料总重量
+ */
+ private String wastedisposal;
+ /**
+ * 单位
+ */
+ private String wastedisposalunit;
+ /**
+ * 功能单位处置量
+ */
+ private String rawmaterialsinput;
+ /**
+ * 单位
+ */
+ private String rawmaterialsunit;
+ /**
+ * 处理方式
+ */
+ private String disposeway;
+ /**
+ * 处理商名称
+ */
+ private String disposename;
+ /**
+ * 处理商地址
+ */
+ private String disposeaddress;
+ /**
+ * 运输方式
+ */
+ private String transmode;
+ /**
+ * 运输工具载重量
+ */
+ private String transloadcapacity;
+ /**
+ * 运输距离
+ */
+ private String transdistance;
+ /**
+ * 单位
+ */
+ private String transdistanceunit;
+ /**
+ * 运输数据来源
+ */
+ private String transdatasource;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 编号
+ */
+ private String wasteno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
new file mode 100644
index 0000000..740834f
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonDiscard.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 废物处置及再利用信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonDiscardMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java
new file mode 100644
index 0000000..ebf4d7b
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonDiscard.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
+
+/**
+ * 废物处置及再利用信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonDiscardService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
new file mode 100644
index 0000000..9436f08
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonDiscard.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper;
+import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
+import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 废物处置及再利用信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonDiscardServiceImpl extends BaseServiceImpl implements CqcCarbonDiscardService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java
new file mode 100644
index 0000000..643590e
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java
@@ -0,0 +1,98 @@
+package com.thing.cqc.CqcCarbonDistribution.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonDistribution.dto.CqcCarbonDistributionDTO;
+import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+* 产品分销信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/cqccarbondistribution")
+@Tag(name="产品分销信息")
+@RequiredArgsConstructor
+public class CqcCarbonDistributionController {
+
+ private final CqcCarbonDistributionService cqcCarbonDistributionService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonDistributionDTO data = cqcCarbonDistributionService.getByIdAs(id, CqcCarbonDistributionDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonDistributionDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonDistributionService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonDistributionDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonDistributionService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonDistributionService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonDistributionService.listAs(params, CqcCarbonDistributionDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "产品分销信息", list, CqcCarbonDistributionExcel.class);
+ *}
+ */
+
+}
\ 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
new file mode 100644
index 0000000..5353eae
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java
@@ -0,0 +1,59 @@
+package com.thing.cqc.CqcCarbonDistribution.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 产品分销信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "产品分销信息")
+public class CqcCarbonDistributionDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号")
+ private String applyNo;
+ @Schema(description = "中文名称")
+ private String materialsnamecn;
+ @Schema(description = "产品出货重量")
+ private String productweight;
+ @Schema(description = "单位")
+ private String productweightunit;
+ @Schema(description = "分销对象")
+ private String distributionobject;
+ @Schema(description = "分销地址")
+ private String distributionaddress;
+ @Schema(description = "运输方式")
+ private String transmode;
+ @Schema(description = "运输工具载重量")
+ private String transloadcapacity;
+ @Schema(description = "运输距离")
+ private String transdistance;
+ @Schema(description = "单位")
+ private String transdistanceunit;
+ @Schema(description = "运输数据来源")
+ private String transdatasource;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "编号")
+ 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
new file mode 100644
index 0000000..ceece46
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java
@@ -0,0 +1,99 @@
+package com.thing.cqc.CqcCarbonDistribution.entity;
+
+import com.mybatisflex.annotation.Table;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 产品分销信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_distribution")
+public class CqcCarbonDistributionEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请编号
+ */
+ private String applyNo;
+ /**
+ * 中文名称
+ */
+ private String materialsnamecn;
+ /**
+ * 产品出货重量
+ */
+ private String productweight;
+ /**
+ * 单位
+ */
+ private String productweightunit;
+ /**
+ * 分销对象
+ */
+ private String distributionobject;
+ /**
+ * 分销地址
+ */
+ private String distributionaddress;
+ /**
+ * 运输方式
+ */
+ private String transmode;
+ /**
+ * 运输工具载重量
+ */
+ private String transloadcapacity;
+ /**
+ * 运输距离
+ */
+ private String transdistance;
+ /**
+ * 单位
+ */
+ private String transdistanceunit;
+ /**
+ * 运输数据来源
+ */
+ private String transdatasource;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 编号
+ */
+ private String disno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
new file mode 100644
index 0000000..55a7270
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonDistribution.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 产品分销信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonDistributionMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java
new file mode 100644
index 0000000..f11db4b
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonDistribution.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
+
+/**
+ * 产品分销信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonDistributionService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
new file mode 100644
index 0000000..ff0be4d
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonDistribution.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper;
+import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
+import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 产品分销信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonDistributionServiceImpl extends BaseServiceImpl implements CqcCarbonDistributionService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java
new file mode 100644
index 0000000..6f53023
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java
@@ -0,0 +1,98 @@
+package com.thing.cqc.CqcCarbonEnergy.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonEnergy.dto.CqcCarbonEnergyDTO;
+import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+* 使用阶段能源信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/cqccarbonenergy")
+@Tag(name=" 使用阶段能源信息")
+@RequiredArgsConstructor
+public class CqcCarbonEnergyController {
+
+ private final CqcCarbonEnergyService cqcCarbonEnergyService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonEnergyDTO data = cqcCarbonEnergyService.getByIdAs(id, CqcCarbonEnergyDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonEnergyDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonEnergyService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonEnergyDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonEnergyService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonEnergyService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonEnergyService.listAs(params, CqcCarbonEnergyDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, " 使用阶段能源信息", list, CqcCarbonEnergyExcel.class);
+ *}
+ */
+
+}
\ 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
new file mode 100644
index 0000000..be1d4fc
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java
@@ -0,0 +1,55 @@
+package com.thing.cqc.CqcCarbonEnergy.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 使用阶段能源信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = " 使用阶段能源信息")
+public class CqcCarbonEnergyDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号")
+ private String applyNo;
+ @Schema(description = "类别")
+ private String cateid;
+ @Schema(description = "使用过程")
+ private String useprocedure;
+ @Schema(description = "排放源")
+ private String emissionsource;
+ @Schema(description = "用途")
+ private String materialsuse;
+ @Schema(description = "产品使用能源总投入量")
+ private String energycapacity;
+ @Schema(description = "单位")
+ private String energycapacityunit;
+ @Schema(description = "功能单位耗用量")
+ private String rawmaterialsinput;
+ @Schema(description = "单位")
+ private String rawmaterialsunit;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "备注")
+ 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
new file mode 100644
index 0000000..d1a9079
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java
@@ -0,0 +1,91 @@
+package com.thing.cqc.CqcCarbonEnergy.entity;
+
+import com.mybatisflex.annotation.Table;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 使用阶段能源信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_energy")
+public class CqcCarbonEnergyEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请编号
+ */
+ private String applyNo;
+ /**
+ * 类别
+ */
+ private String cateid;
+ /**
+ * 使用过程
+ */
+ private String useprocedure;
+ /**
+ * 排放源
+ */
+ private String emissionsource;
+ /**
+ * 用途
+ */
+ private String materialsuse;
+ /**
+ * 产品使用能源总投入量
+ */
+ private String energycapacity;
+ /**
+ * 单位
+ */
+ private String energycapacityunit;
+ /**
+ * 功能单位耗用量
+ */
+ private String rawmaterialsinput;
+ /**
+ * 单位
+ */
+ private String rawmaterialsunit;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 备注
+ */
+ private String consumeno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
new file mode 100644
index 0000000..9bc4363
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonEnergy.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 使用阶段能源信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonEnergyMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java
new file mode 100644
index 0000000..c8550d5
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonEnergy.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
+
+/**
+ * 使用阶段能源信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonEnergyService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
new file mode 100644
index 0000000..22e34a4
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonEnergy.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper;
+import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
+import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 使用阶段能源信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonEnergyServiceImpl extends BaseServiceImpl implements CqcCarbonEnergyService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java
new file mode 100644
index 0000000..62f0ee6
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java
@@ -0,0 +1,98 @@
+package com.thing.cqc.CqcCarbonMake.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonMake.dto.CqcCarbonMakeDTO;
+import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+* 制造阶段能源消耗信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/cqccarbonmake")
+@Tag(name="制造阶段能源消耗信息")
+@RequiredArgsConstructor
+public class CqcCarbonMakeController {
+
+ private final CqcCarbonMakeService cqcCarbonMakeService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonMakeDTO data = cqcCarbonMakeService.getByIdAs(id, CqcCarbonMakeDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonMakeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonMakeService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonMakeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonMakeService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonMakeService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonMakeService.listAs(params, CqcCarbonMakeDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "制造阶段能源消耗信息", list, CqcCarbonMakeExcel.class);
+ *}
+ */
+
+}
\ 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
new file mode 100644
index 0000000..b0206ce
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java
@@ -0,0 +1,53 @@
+package com.thing.cqc.CqcCarbonMake.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 制造阶段能源消耗信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "制造阶段能源消耗信息")
+public class CqcCarbonMakeDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号,,关联申请记录表申请唯一编码")
+ private String applyNo;
+ @Schema(description = "类别")
+ private String cateid;
+ @Schema(description = "制程投入位置")
+ private String useplace;
+ @Schema(description = "排放源")
+ private String emissionsource;
+ @Schema(description = "全厂总用量")
+ private String totalelectricity;
+ @Schema(description = "全厂总用量单位")
+ private String totalelectricityunit;
+ @Schema(description = "功能单位消耗量")
+ private String specificconsumption;
+ @Schema(description = "消耗量单位")
+ private String specificconsumptionunit;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "编号")
+ 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
new file mode 100644
index 0000000..48beaea
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java
@@ -0,0 +1,87 @@
+package com.thing.cqc.CqcCarbonMake.entity;
+
+import com.mybatisflex.annotation.Table;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 制造阶段能源消耗信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_make")
+public class CqcCarbonMakeEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请编号,,关联申请记录表申请唯一编码
+ */
+ private String applyNo;
+ /**
+ * 类别
+ */
+ private String cateid;
+ /**
+ * 制程投入位置
+ */
+ private String useplace;
+ /**
+ * 排放源
+ */
+ private String emissionsource;
+ /**
+ * 全厂总用量
+ */
+ private String totalelectricity;
+ /**
+ * 全厂总用量单位
+ */
+ private String totalelectricityunit;
+ /**
+ * 功能单位消耗量
+ */
+ private String specificconsumption;
+ /**
+ * 消耗量单位
+ */
+ private String specificconsumptionunit;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 编号
+ */
+ private String makeno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java
new file mode 100644
index 0000000..5fef182
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonMake.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 制造阶段能源消耗信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonMakeMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java
new file mode 100644
index 0000000..2bb4955
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonMake.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
+
+/**
+ * 制造阶段能源消耗信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonMakeService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
new file mode 100644
index 0000000..5ade199
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonMake.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper;
+import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
+import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 制造阶段能源消耗信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonMakeServiceImpl extends BaseServiceImpl implements CqcCarbonMakeService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java
new file mode 100644
index 0000000..a9be11a
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java
@@ -0,0 +1,98 @@
+package com.thing.cqc.CqcCarbonRaw.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
+import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+* 原物料阶段数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/cqccarbonraw")
+@Tag(name="原物料阶段数据")
+@RequiredArgsConstructor
+public class CqcCarbonRawController {
+
+ private final CqcCarbonRawService cqcCarbonRawService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonRawDTO data = cqcCarbonRawService.getByIdAs(id, CqcCarbonRawDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonRawDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonRawService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonRawDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonRawService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonRawService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonRawService.listAs(params, CqcCarbonRawDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "原物料阶段数据", list, CqcCarbonRawExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java
new file mode 100644
index 0000000..49023f4
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java
@@ -0,0 +1,71 @@
+package com.thing.cqc.CqcCarbonRaw.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 原物料阶段数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "原物料阶段数据")
+public class CqcCarbonRawDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "记录ID")
+ private Long id;
+ @Schema(description = "申请唯一编码,关联申请记录表申请唯一编码")
+ private String applyNo;
+ @Schema(description = "材料编号")
+ private String materialno;
+ @Schema(description = "类别ID")
+ private String cateid;
+ @Schema(description = "材料中文名称")
+ private String materialsnamecn;
+ @Schema(description = "材料英文名称及化学名称")
+ private String materialsnameen;
+ @Schema(description = "生成工序")
+ private String productionprocesses;
+ @Schema(description = "材料组份名称及比例")
+ private String materialcomponent;
+ @Schema(description = "盘查期间内生产该产品所使用原料总投入量")
+ private String productcapacity;
+ @Schema(description = "投入量单位")
+ private String productcapacityunit;
+ @Schema(description = "功能单位原物料投入量")
+ private String rawmaterialsinput;
+ @Schema(description = "原物料投入量单位")
+ private String rawmaterialsunit;
+ @Schema(description = "供货商名称")
+ private String suppliername;
+ @Schema(description = "供货商地址")
+ private String supplieraddress;
+ @Schema(description = "运输方式")
+ private String transmode;
+ @Schema(description = "运输工具载重量")
+ private String transloadcapacity;
+ @Schema(description = "运输距离")
+ private String transdistance;
+ @Schema(description = "运输距离单位")
+ private String transdistanceunit;
+ @Schema(description = "运输数据来源")
+ private String transdatasource;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "负责人")
+ private String person;
+ @Schema(description = "联系电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java
new file mode 100644
index 0000000..0c74558
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java
@@ -0,0 +1,123 @@
+package com.thing.cqc.CqcCarbonRaw.entity;
+
+import com.mybatisflex.annotation.Table;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 原物料阶段数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_raw")
+public class CqcCarbonRawEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 记录ID
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请唯一编码,关联申请记录表申请唯一编码
+ */
+ private String applyNo;
+ /**
+ * 材料编号
+ */
+ private String materialno;
+ /**
+ * 类别ID
+ */
+ private String cateid;
+ /**
+ * 材料中文名称
+ */
+ private String materialsnamecn;
+ /**
+ * 材料英文名称及化学名称
+ */
+ private String materialsnameen;
+ /**
+ * 生成工序
+ */
+ private String productionprocesses;
+ /**
+ * 材料组份名称及比例
+ */
+ private String materialcomponent;
+ /**
+ * 盘查期间内生产该产品所使用原料总投入量
+ */
+ private String productcapacity;
+ /**
+ * 投入量单位
+ */
+ private String productcapacityunit;
+ /**
+ * 功能单位原物料投入量
+ */
+ private String rawmaterialsinput;
+ /**
+ * 原物料投入量单位
+ */
+ private String rawmaterialsunit;
+ /**
+ * 供货商名称
+ */
+ private String suppliername;
+ /**
+ * 供货商地址
+ */
+ private String supplieraddress;
+ /**
+ * 运输方式
+ */
+ private String transmode;
+ /**
+ * 运输工具载重量
+ */
+ private String transloadcapacity;
+ /**
+ * 运输距离
+ */
+ private String transdistance;
+ /**
+ * 运输距离单位
+ */
+ private String transdistanceunit;
+ /**
+ * 运输数据来源
+ */
+ private String transdatasource;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 负责人
+ */
+ private String person;
+ /**
+ * 联系电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
new file mode 100644
index 0000000..7b63ae2
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java
@@ -0,0 +1,96 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.dto.CqcCarbonConsumablesDTO;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+/**
+* 使用阶段耗材信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/CqcCarbonConsumables/cqccarbonconsumables")
+@Tag(name="使用阶段耗材信息")
+@RequiredArgsConstructor
+public class CqcCarbonConsumablesController {
+
+ private final CqcCarbonConsumablesService cqcCarbonConsumablesService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonConsumablesDTO data = cqcCarbonConsumablesService.getByIdAs(id, CqcCarbonConsumablesDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonConsumablesDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonConsumablesService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonConsumablesDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonConsumablesService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonConsumablesService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonConsumablesService.listAs(params, CqcCarbonConsumablesDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "使用阶段耗材信息", list, CqcCarbonConsumablesExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java
new file mode 100644
index 0000000..ec6f06c
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java
@@ -0,0 +1,70 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 使用阶段耗材信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "使用阶段耗材信息")
+public class CqcCarbonConsumablesDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号")
+ private String applyNo;
+ @Schema(description = "类别")
+ private String cateid;
+ @Schema(description = "中文名称")
+ private String materialsnamecn;
+ @Schema(description = "化学名称")
+ private String materialsnameen;
+ @Schema(description = "用途")
+ private String materialsuse;
+ @Schema(description = "材料组份")
+ private String materialcomponent;
+ @Schema(description = "产品使用耗材总投入量")
+ private String productcapacity;
+ @Schema(description = "单位")
+ private String productcapacityunit;
+ @Schema(description = "功能单位耗用量")
+ private String rawmaterialsinput;
+ @Schema(description = "单位")
+ private String rawmaterialsunit;
+ @Schema(description = "供货商名称")
+ private String suppliername;
+ @Schema(description = "供货商地址")
+ private String supplieraddress;
+ @Schema(description = "运输方式")
+ private String transmode;
+ @Schema(description = "运输工具载重量")
+ private String transloadcapacity;
+ @Schema(description = "运输距离")
+ private String transdistance;
+ @Schema(description = "单位")
+ private String transdistanceunit;
+ @Schema(description = "运输数据来源")
+ private String transdatasource;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "能源编号")
+ private String energyno;
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java
new file mode 100644
index 0000000..0ac60e2
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java
@@ -0,0 +1,121 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity;
+
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 使用阶段耗材信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_consumables")
+public class CqcCarbonConsumablesEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ private Long id;
+ /**
+ * 申请编号
+ */
+ private String applyNo;
+ /**
+ * 类别
+ */
+ private String cateid;
+ /**
+ * 中文名称
+ */
+ private String materialsnamecn;
+ /**
+ * 化学名称
+ */
+ private String materialsnameen;
+ /**
+ * 用途
+ */
+ private String materialsuse;
+ /**
+ * 材料组份
+ */
+ private String materialcomponent;
+ /**
+ * 产品使用耗材总投入量
+ */
+ private String productcapacity;
+ /**
+ * 单位
+ */
+ private String productcapacityunit;
+ /**
+ * 功能单位耗用量
+ */
+ private String rawmaterialsinput;
+ /**
+ * 单位
+ */
+ private String rawmaterialsunit;
+ /**
+ * 供货商名称
+ */
+ private String suppliername;
+ /**
+ * 供货商地址
+ */
+ private String supplieraddress;
+ /**
+ * 运输方式
+ */
+ private String transmode;
+ /**
+ * 运输工具载重量
+ */
+ private String transloadcapacity;
+ /**
+ * 运输距离
+ */
+ private String transdistance;
+ /**
+ * 单位
+ */
+ private String transdistanceunit;
+ /**
+ * 运输数据来源
+ */
+ private String transdatasource;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 能源编号
+ */
+ private String energyno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
new file mode 100644
index 0000000..522cab1
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 使用阶段耗材信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonConsumablesMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java
new file mode 100644
index 0000000..bd2ae70
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
+
+/**
+ * 使用阶段耗材信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonConsumablesService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
new file mode 100644
index 0000000..fb3f23f
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 使用阶段耗材信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonConsumablesServiceImpl extends BaseServiceImpl implements CqcCarbonConsumablesService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java
new file mode 100644
index 0000000..7c34cdb
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java
@@ -0,0 +1,96 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.dto.CqcCarbonDiscardDTO;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+/**
+* 废物处置及再利用信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/CqcCarbonDiscard/cqccarbondiscard")
+@Tag(name="废物处置及再利用信息")
+@RequiredArgsConstructor
+public class CqcCarbonDiscardController {
+
+ private final CqcCarbonDiscardService cqcCarbonDiscardService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonDiscardDTO data = cqcCarbonDiscardService.getByIdAs(id, CqcCarbonDiscardDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonDiscardDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonDiscardService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonDiscardDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonDiscardService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonDiscardService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonDiscardService.listAs(params, CqcCarbonDiscardDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "废物处置及再利用信息", list, CqcCarbonDiscardExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java
new file mode 100644
index 0000000..e388282
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java
@@ -0,0 +1,70 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 废物处置及再利用信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "废物处置及再利用信息")
+public class CqcCarbonDiscardDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号")
+ private String applyNo;
+ @Schema(description = "类别")
+ private String cateid;
+ @Schema(description = "中文名称")
+ private String materialsnamecn;
+ @Schema(description = "化学名称")
+ private String materialsnameen;
+ @Schema(description = "材料组份")
+ private String materialcomponent;
+ @Schema(description = "废物处置材料总重量")
+ private String wastedisposal;
+ @Schema(description = "单位")
+ private String wastedisposalunit;
+ @Schema(description = "功能单位处置量")
+ private String rawmaterialsinput;
+ @Schema(description = "单位")
+ private String rawmaterialsunit;
+ @Schema(description = "处理方式")
+ private String disposeway;
+ @Schema(description = "处理商名称")
+ private String disposename;
+ @Schema(description = "处理商地址")
+ private String disposeaddress;
+ @Schema(description = "运输方式")
+ private String transmode;
+ @Schema(description = "运输工具载重量")
+ private String transloadcapacity;
+ @Schema(description = "运输距离")
+ private String transdistance;
+ @Schema(description = "单位")
+ private String transdistanceunit;
+ @Schema(description = "运输数据来源")
+ private String transdatasource;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "编号")
+ private String wasteno;
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java
new file mode 100644
index 0000000..dcb2cd6
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java
@@ -0,0 +1,122 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity;
+
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 废物处置及再利用信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_discard")
+public class CqcCarbonDiscardEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请编号
+ */
+ private String applyNo;
+ /**
+ * 类别
+ */
+ private String cateid;
+ /**
+ * 中文名称
+ */
+ private String materialsnamecn;
+ /**
+ * 化学名称
+ */
+ private String materialsnameen;
+ /**
+ * 材料组份
+ */
+ private String materialcomponent;
+ /**
+ * 废物处置材料总重量
+ */
+ private String wastedisposal;
+ /**
+ * 单位
+ */
+ private String wastedisposalunit;
+ /**
+ * 功能单位处置量
+ */
+ private String rawmaterialsinput;
+ /**
+ * 单位
+ */
+ private String rawmaterialsunit;
+ /**
+ * 处理方式
+ */
+ private String disposeway;
+ /**
+ * 处理商名称
+ */
+ private String disposename;
+ /**
+ * 处理商地址
+ */
+ private String disposeaddress;
+ /**
+ * 运输方式
+ */
+ private String transmode;
+ /**
+ * 运输工具载重量
+ */
+ private String transloadcapacity;
+ /**
+ * 运输距离
+ */
+ private String transdistance;
+ /**
+ * 单位
+ */
+ private String transdistanceunit;
+ /**
+ * 运输数据来源
+ */
+ private String transdatasource;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 编号
+ */
+ private String wasteno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
new file mode 100644
index 0000000..f8467eb
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 废物处置及再利用信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonDiscardMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java
new file mode 100644
index 0000000..c914de7
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
+
+/**
+ * 废物处置及再利用信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonDiscardService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
new file mode 100644
index 0000000..844250e
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 废物处置及再利用信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonDiscardServiceImpl extends BaseServiceImpl implements CqcCarbonDiscardService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java
new file mode 100644
index 0000000..d559da2
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java
@@ -0,0 +1,96 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.dto.CqcCarbonDistributionDTO;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+/**
+* 产品分销信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/CqcCarbonDistribution/cqccarbondistribution")
+@Tag(name="产品分销信息")
+@RequiredArgsConstructor
+public class CqcCarbonDistributionController {
+
+ private final CqcCarbonDistributionService cqcCarbonDistributionService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonDistributionDTO data = cqcCarbonDistributionService.getByIdAs(id, CqcCarbonDistributionDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonDistributionDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonDistributionService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonDistributionDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonDistributionService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonDistributionService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonDistributionService.listAs(params, CqcCarbonDistributionDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "产品分销信息", list, CqcCarbonDistributionExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java
new file mode 100644
index 0000000..dfdcba0
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java
@@ -0,0 +1,58 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 产品分销信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "产品分销信息")
+public class CqcCarbonDistributionDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号")
+ private String applyNo;
+ @Schema(description = "中文名称")
+ private String materialsnamecn;
+ @Schema(description = "产品出货重量")
+ private String productweight;
+ @Schema(description = "单位")
+ private String productweightunit;
+ @Schema(description = "分销对象")
+ private String distributionobject;
+ @Schema(description = "分销地址")
+ private String distributionaddress;
+ @Schema(description = "运输方式")
+ private String transmode;
+ @Schema(description = "运输工具载重量")
+ private String transloadcapacity;
+ @Schema(description = "运输距离")
+ private String transdistance;
+ @Schema(description = "单位")
+ private String transdistanceunit;
+ @Schema(description = "运输数据来源")
+ private String transdatasource;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "编号")
+ private String disno;
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java
new file mode 100644
index 0000000..a55bc45
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java
@@ -0,0 +1,98 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity;
+
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 产品分销信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_distribution")
+public class CqcCarbonDistributionEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请编号
+ */
+ private String applyNo;
+ /**
+ * 中文名称
+ */
+ private String materialsnamecn;
+ /**
+ * 产品出货重量
+ */
+ private String productweight;
+ /**
+ * 单位
+ */
+ private String productweightunit;
+ /**
+ * 分销对象
+ */
+ private String distributionobject;
+ /**
+ * 分销地址
+ */
+ private String distributionaddress;
+ /**
+ * 运输方式
+ */
+ private String transmode;
+ /**
+ * 运输工具载重量
+ */
+ private String transloadcapacity;
+ /**
+ * 运输距离
+ */
+ private String transdistance;
+ /**
+ * 单位
+ */
+ private String transdistanceunit;
+ /**
+ * 运输数据来源
+ */
+ private String transdatasource;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 编号
+ */
+ private String disno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
new file mode 100644
index 0000000..a931f40
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 产品分销信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonDistributionMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java
new file mode 100644
index 0000000..e3d117d
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
+
+/**
+ * 产品分销信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonDistributionService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
new file mode 100644
index 0000000..defefc8
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 产品分销信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonDistributionServiceImpl extends BaseServiceImpl implements CqcCarbonDistributionService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java
new file mode 100644
index 0000000..b4681b8
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java
@@ -0,0 +1,96 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.dto.CqcCarbonEnergyDTO;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+/**
+* 使用阶段能源信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/CqcCarbonEnergy/cqccarbonenergy")
+@Tag(name=" 使用阶段能源信息")
+@RequiredArgsConstructor
+public class CqcCarbonEnergyController {
+
+ private final CqcCarbonEnergyService cqcCarbonEnergyService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonEnergyDTO data = cqcCarbonEnergyService.getByIdAs(id, CqcCarbonEnergyDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonEnergyDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonEnergyService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonEnergyDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonEnergyService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonEnergyService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonEnergyService.listAs(params, CqcCarbonEnergyDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, " 使用阶段能源信息", list, CqcCarbonEnergyExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java
new file mode 100644
index 0000000..5e7bcdd
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java
@@ -0,0 +1,54 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 使用阶段能源信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = " 使用阶段能源信息")
+public class CqcCarbonEnergyDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号")
+ private String applyNo;
+ @Schema(description = "类别")
+ private String cateid;
+ @Schema(description = "使用过程")
+ private String useprocedure;
+ @Schema(description = "排放源")
+ private String emissionsource;
+ @Schema(description = "用途")
+ private String materialsuse;
+ @Schema(description = "产品使用能源总投入量")
+ private String energycapacity;
+ @Schema(description = "单位")
+ private String energycapacityunit;
+ @Schema(description = "功能单位耗用量")
+ private String rawmaterialsinput;
+ @Schema(description = "单位")
+ private String rawmaterialsunit;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "备注")
+ private String consumeno;
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java
new file mode 100644
index 0000000..883f352
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java
@@ -0,0 +1,90 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity;
+
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 使用阶段能源信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_energy")
+public class CqcCarbonEnergyEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请编号
+ */
+ private String applyNo;
+ /**
+ * 类别
+ */
+ private String cateid;
+ /**
+ * 使用过程
+ */
+ private String useprocedure;
+ /**
+ * 排放源
+ */
+ private String emissionsource;
+ /**
+ * 用途
+ */
+ private String materialsuse;
+ /**
+ * 产品使用能源总投入量
+ */
+ private String energycapacity;
+ /**
+ * 单位
+ */
+ private String energycapacityunit;
+ /**
+ * 功能单位耗用量
+ */
+ private String rawmaterialsinput;
+ /**
+ * 单位
+ */
+ private String rawmaterialsunit;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 备注
+ */
+ private String consumeno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
new file mode 100644
index 0000000..5229466
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 使用阶段能源信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonEnergyMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java
new file mode 100644
index 0000000..625065d
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
+
+/**
+ * 使用阶段能源信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonEnergyService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
new file mode 100644
index 0000000..fc28a48
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 使用阶段能源信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonEnergyServiceImpl extends BaseServiceImpl implements CqcCarbonEnergyService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java
new file mode 100644
index 0000000..f5ba3e4
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java
@@ -0,0 +1,96 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.dto.CqcCarbonMakeDTO;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+/**
+* 制造阶段能源消耗信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/CqcCarbonMake/cqccarbonmake")
+@Tag(name="制造阶段能源消耗信息")
+@RequiredArgsConstructor
+public class CqcCarbonMakeController {
+
+ private final CqcCarbonMakeService cqcCarbonMakeService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonMakeDTO data = cqcCarbonMakeService.getByIdAs(id, CqcCarbonMakeDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonMakeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonMakeService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonMakeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonMakeService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonMakeService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonMakeService.listAs(params, CqcCarbonMakeDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "制造阶段能源消耗信息", list, CqcCarbonMakeExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java
new file mode 100644
index 0000000..8b43486
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java
@@ -0,0 +1,52 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 制造阶段能源消耗信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "制造阶段能源消耗信息")
+public class CqcCarbonMakeDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "唯一标识符")
+ private Long id;
+ @Schema(description = "申请编号,,关联申请记录表申请唯一编码")
+ private String applyNo;
+ @Schema(description = "类别")
+ private String cateid;
+ @Schema(description = "制程投入位置")
+ private String useplace;
+ @Schema(description = "排放源")
+ private String emissionsource;
+ @Schema(description = "全厂总用量")
+ private String totalelectricity;
+ @Schema(description = "全厂总用量单位")
+ private String totalelectricityunit;
+ @Schema(description = "功能单位消耗量")
+ private String specificconsumption;
+ @Schema(description = "消耗量单位")
+ private String specificconsumptionunit;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "人员")
+ private String person;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+ @Schema(description = "编号")
+ private String makeno;
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java
new file mode 100644
index 0000000..70bc739
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java
@@ -0,0 +1,86 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity;
+
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 制造阶段能源消耗信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_make")
+public class CqcCarbonMakeEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一标识符
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请编号,,关联申请记录表申请唯一编码
+ */
+ private String applyNo;
+ /**
+ * 类别
+ */
+ private String cateid;
+ /**
+ * 制程投入位置
+ */
+ private String useplace;
+ /**
+ * 排放源
+ */
+ private String emissionsource;
+ /**
+ * 全厂总用量
+ */
+ private String totalelectricity;
+ /**
+ * 全厂总用量单位
+ */
+ private String totalelectricityunit;
+ /**
+ * 功能单位消耗量
+ */
+ private String specificconsumption;
+ /**
+ * 消耗量单位
+ */
+ private String specificconsumptionunit;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 人员
+ */
+ private String person;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+ /**
+ * 编号
+ */
+ private String makeno;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java
new file mode 100644
index 0000000..af4b4cd
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 制造阶段能源消耗信息
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonMakeMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java
new file mode 100644
index 0000000..718c0a4
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
+
+/**
+ * 制造阶段能源消耗信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonMakeService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
new file mode 100644
index 0000000..91ff389
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 制造阶段能源消耗信息
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonMakeServiceImpl extends BaseServiceImpl implements CqcCarbonMakeService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java
new file mode 100644
index 0000000..c9db104
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java
@@ -0,0 +1,96 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+/**
+* 原物料阶段数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/CqcCarbonRaw/cqccarbonraw")
+@Tag(name="原物料阶段数据")
+@RequiredArgsConstructor
+public class CqcCarbonRawController {
+
+ private final CqcCarbonRawService cqcCarbonRawService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonRawDTO data = cqcCarbonRawService.getByIdAs(id, CqcCarbonRawDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonRawDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonRawService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonRawDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonRawService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonRawService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonRawService.listAs(params, CqcCarbonRawDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "原物料阶段数据", list, CqcCarbonRawExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java
new file mode 100644
index 0000000..84a00c8
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java
@@ -0,0 +1,70 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 原物料阶段数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "原物料阶段数据")
+public class CqcCarbonRawDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "记录ID")
+ private Long id;
+ @Schema(description = "申请唯一编码,关联申请记录表申请唯一编码")
+ private String applyNo;
+ @Schema(description = "材料编号")
+ private String materialno;
+ @Schema(description = "类别ID")
+ private String cateid;
+ @Schema(description = "材料中文名称")
+ private String materialsnamecn;
+ @Schema(description = "材料英文名称及化学名称")
+ private String materialsnameen;
+ @Schema(description = "生成工序")
+ private String productionprocesses;
+ @Schema(description = "材料组份名称及比例")
+ private String materialcomponent;
+ @Schema(description = "盘查期间内生产该产品所使用原料总投入量")
+ private String productcapacity;
+ @Schema(description = "投入量单位")
+ private String productcapacityunit;
+ @Schema(description = "功能单位原物料投入量")
+ private String rawmaterialsinput;
+ @Schema(description = "原物料投入量单位")
+ private String rawmaterialsunit;
+ @Schema(description = "供货商名称")
+ private String suppliername;
+ @Schema(description = "供货商地址")
+ private String supplieraddress;
+ @Schema(description = "运输方式")
+ private String transmode;
+ @Schema(description = "运输工具载重量")
+ private String transloadcapacity;
+ @Schema(description = "运输距离")
+ private String transdistance;
+ @Schema(description = "运输距离单位")
+ private String transdistanceunit;
+ @Schema(description = "运输数据来源")
+ private String transdatasource;
+ @Schema(description = "活动数据来源")
+ private String activitydatasource;
+ @Schema(description = "部门")
+ private String dept;
+ @Schema(description = "负责人")
+ private String person;
+ @Schema(description = "联系电话")
+ private String phone;
+ @Schema(description = "备注")
+ private String remake;
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java
new file mode 100644
index 0000000..b844591
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java
@@ -0,0 +1,122 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity;
+
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 原物料阶段数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_raw")
+public class CqcCarbonRawEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 记录ID
+ */
+ @Id
+ private Long id;
+ /**
+ * 申请唯一编码,关联申请记录表申请唯一编码
+ */
+ private String applyNo;
+ /**
+ * 材料编号
+ */
+ private String materialno;
+ /**
+ * 类别ID
+ */
+ private String cateid;
+ /**
+ * 材料中文名称
+ */
+ private String materialsnamecn;
+ /**
+ * 材料英文名称及化学名称
+ */
+ private String materialsnameen;
+ /**
+ * 生成工序
+ */
+ private String productionprocesses;
+ /**
+ * 材料组份名称及比例
+ */
+ private String materialcomponent;
+ /**
+ * 盘查期间内生产该产品所使用原料总投入量
+ */
+ private String productcapacity;
+ /**
+ * 投入量单位
+ */
+ private String productcapacityunit;
+ /**
+ * 功能单位原物料投入量
+ */
+ private String rawmaterialsinput;
+ /**
+ * 原物料投入量单位
+ */
+ private String rawmaterialsunit;
+ /**
+ * 供货商名称
+ */
+ private String suppliername;
+ /**
+ * 供货商地址
+ */
+ private String supplieraddress;
+ /**
+ * 运输方式
+ */
+ private String transmode;
+ /**
+ * 运输工具载重量
+ */
+ private String transloadcapacity;
+ /**
+ * 运输距离
+ */
+ private String transdistance;
+ /**
+ * 运输距离单位
+ */
+ private String transdistanceunit;
+ /**
+ * 运输数据来源
+ */
+ private String transdatasource;
+ /**
+ * 活动数据来源
+ */
+ private String activitydatasource;
+ /**
+ * 部门
+ */
+ private String dept;
+ /**
+ * 负责人
+ */
+ private String person;
+ /**
+ * 联系电话
+ */
+ private String phone;
+ /**
+ * 备注
+ */
+ private String remake;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java
new file mode 100644
index 0000000..cddd08a
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 原物料阶段数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonRawMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java
new file mode 100644
index 0000000..805d65a
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+
+/**
+ * 原物料阶段数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonRawService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
new file mode 100644
index 0000000..09b67c3
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 原物料阶段数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonRawServiceImpl extends BaseServiceImpl implements CqcCarbonRawService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java
new file mode 100644
index 0000000..6386eb5
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java
@@ -0,0 +1,96 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.dto.CqcCarbonReportDTO;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
+
+/**
+* 申请表基础数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/CqcCarbonReport/cqccarbonreport")
+@Tag(name="申请表基础数据")
+@RequiredArgsConstructor
+public class CqcCarbonReportController {
+
+ private final CqcCarbonReportService cqcCarbonReportService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonReportService.getPageData(params, CqcCarbonReportDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonReportDTO data = cqcCarbonReportService.getByIdAs(id, CqcCarbonReportDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonReportDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonReportService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonReportDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonReportService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonReportService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonReportService.listAs(params, CqcCarbonReportDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "申请表基础数据", list, CqcCarbonReportExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java
new file mode 100644
index 0000000..e51962b
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java
@@ -0,0 +1,164 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 申请表基础数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "申请表基础数据")
+public class CqcCarbonReportDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "受理机构")
+ private String deptId;
+ @Schema(description = "申请唯一编码(自行设定规则,与文件传输接口对应)")
+ private String applyNo;
+ @Schema(description = "委托方名称(中文)")
+ private String clientNameCn;
+ @Schema(description = "委托方名称(英文)")
+ private String clientNameEn;
+ @Schema(description = "委托方地址(中文)")
+ private String clientAddressCn;
+ @Schema(description = "委托方地址(英文)")
+ private String clientAddressEn;
+ @Schema(description = "委托方邮编")
+ private String clientPostcode;
+ @Schema(description = "委托方联系人姓名")
+ private String clientContactName;
+ @Schema(description = "委托方部门")
+ private String clientDepartment;
+ @Schema(description = "委托方职务")
+ private String clientPosition;
+ @Schema(description = "委托方电话")
+ private String clientPhone;
+ @Schema(description = "委托方传真")
+ private String clientFax;
+ @Schema(description = "委托方E-MAIL")
+ private String clientEmail;
+ @Schema(description = "与受核查方的关系")
+ private String relationshipWithChecked;
+ @Schema(description = "核查涉及的企业名称(中文)")
+ private String enterpriseNameCn;
+ @Schema(description = "核查涉及的企业名称(英文)")
+ private String enterpriseNameEn;
+ @Schema(description = "核查涉及的企业地址(中文)")
+ private String enterpriseAddressCn;
+ @Schema(description = "核查涉及的企业地址(英文)")
+ private String enterpriseAddressEn;
+ @Schema(description = "企业性质 1-国企 2-私企 3-外资或合资")
+ private String enterpriseNature;
+ @Schema(description = "提供产品或服务")
+ private String offerProduct;
+ @Schema(description = "提供产品或服务的年产量")
+ private String annualProduction;
+ @Schema(description = "产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息")
+ private String supplyDataAvailable;
+ @Schema(description = "公司网址")
+ private String companyUrl;
+ @Schema(description = "原材料运输数据是否齐全 1-是 0-否")
+ private String transportationDataComplete;
+ @Schema(description = "是否做过ISO 14064-1温室气体盘查 1-是 0-否")
+ private String isUseIso;
+ @Schema(description = "当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他")
+ private String currentEnergySource;
+ @Schema(description = "当前能源使用来源其他信息填写")
+ private String currentEnergyOther;
+ @Schema(description = "工厂名称(中文)")
+ private String factoryNameCn;
+ @Schema(description = "工厂名称(英文)")
+ private String factoryNameEn;
+ @Schema(description = "工厂地址(中文)")
+ private String factoryAddressCn;
+ @Schema(description = "工厂地址(英文)")
+ private String factoryAddressEn;
+ @Schema(description = "是否做过碳足迹盘查 1-是 0-否")
+ private String isCarbonCheck;
+ @Schema(description = "申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓")
+ private String checkType;
+ @Schema(description = "委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级")
+ private String expectedCheckLevel;
+ @Schema(description = "核查过程所使用的语言")
+ private String language;
+ @Schema(description = "接受核查的产品名称(中文)")
+ private String productNameCn;
+ @Schema(description = "接受核查的产品名称(英文)")
+ private String productNameEn;
+ @Schema(description = "接受核查的产品型号(中文)")
+ private String productModelCn;
+ @Schema(description = "接受核查的产品型号(英文)")
+ private String productModelEn;
+ @Schema(description = "产品碳足迹数据开始时间")
+ private String startDate;
+ @Schema(description = "产品碳足迹数据结束时间")
+ private String endDate;
+ @Schema(description = "希望文件评审的日期")
+ private String fileReviewDate;
+ @Schema(description = "希望提交核查陈述的日期")
+ private String statementSubmissionDate;
+ @Schema(description = "希望实施现场核查的日期")
+ private String onSiteCheckDate;
+ @Schema(description = "希望发布最终证书的日期")
+ private String certificateReleaseDate;
+ @Schema(description = "其他要求")
+ private String otherRequirements;
+ @Schema(description = "是否已经编制过GHG清单 1-是 0-否")
+ private String ghgInventoryPrepared;
+ @Schema(description = "GHG清单所覆盖的时间段")
+ private String ghgInventoryCoveredPeriod;
+ @Schema(description = "需要特殊关注的事项")
+ private String specialAttention;
+ @Schema(description = "工艺流程简述")
+ private String processDescription;
+ @Schema(description = "产品信息")
+ private String productInfo;
+ @Schema(description = "公司简介")
+ private String companyInfo;
+ @Schema(description = "盘查期间场内平均人数")
+ private String avgPersonNum;
+ @Schema(description = "盘查期间场内平均工时")
+ private String avgWorkTim;
+ @Schema(description = "计量单位")
+ private String measureUnit;
+ @Schema(description = "待核查产品的总产量")
+ private String waitProductionCapacity;
+ @Schema(description = "总量单位")
+ private String waitProductionUnit;
+ @Schema(description = "单件重量")
+ private String pieceWeight;
+ @Schema(description = "单件重量单位")
+ private String pieceWeightUnit;
+ @Schema(description = "生产的所有产品的总产量")
+ private String fullProductionCapacity;
+ @Schema(description = "生产的所有产品的总产量单位")
+ private String fullProductionUnit;
+ @Schema(description = "审核主管")
+ private String checkExecutive;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "email")
+ private String email;
+ @Schema(description = "主键id")
+ private Long id;
+ @Schema(description = "租户编码")
+ private Long tenantCode;
+ @Schema(description = "企业id")
+ private Long companyId;
+ @Schema(description = "创建人")
+ private Long creator;
+ @Schema(description = "创建时间")
+ private Long createDate;
+ @Schema(description = "更新人")
+ private Long updater;
+ @Schema(description = "更新时间")
+ private Long updateDate;
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java
new file mode 100644
index 0000000..6fb8592
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java
@@ -0,0 +1,309 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity;
+
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 申请表基础数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_report")
+public class CqcCarbonReportEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 受理机构
+ */
+ private String deptId;
+ /**
+ * 申请唯一编码(自行设定规则,与文件传输接口对应)
+ */
+ private String applyNo;
+ /**
+ * 委托方名称(中文)
+ */
+ private String clientNameCn;
+ /**
+ * 委托方名称(英文)
+ */
+ private String clientNameEn;
+ /**
+ * 委托方地址(中文)
+ */
+ private String clientAddressCn;
+ /**
+ * 委托方地址(英文)
+ */
+ private String clientAddressEn;
+ /**
+ * 委托方邮编
+ */
+ private String clientPostcode;
+ /**
+ * 委托方联系人姓名
+ */
+ private String clientContactName;
+ /**
+ * 委托方部门
+ */
+ private String clientDepartment;
+ /**
+ * 委托方职务
+ */
+ private String clientPosition;
+ /**
+ * 委托方电话
+ */
+ private String clientPhone;
+ /**
+ * 委托方传真
+ */
+ private String clientFax;
+ /**
+ * 委托方E-MAIL
+ */
+ private String clientEmail;
+ /**
+ * 与受核查方的关系
+ */
+ private String relationshipWithChecked;
+ /**
+ * 核查涉及的企业名称(中文)
+ */
+ private String enterpriseNameCn;
+ /**
+ * 核查涉及的企业名称(英文)
+ */
+ private String enterpriseNameEn;
+ /**
+ * 核查涉及的企业地址(中文)
+ */
+ private String enterpriseAddressCn;
+ /**
+ * 核查涉及的企业地址(英文)
+ */
+ private String enterpriseAddressEn;
+ /**
+ * 企业性质 1-国企 2-私企 3-外资或合资
+ */
+ private String enterpriseNature;
+ /**
+ * 提供产品或服务
+ */
+ private String offerProduct;
+ /**
+ * 提供产品或服务的年产量
+ */
+ private String annualProduction;
+ /**
+ * 产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息
+ */
+ private String supplyDataAvailable;
+ /**
+ * 公司网址
+ */
+ private String companyUrl;
+ /**
+ * 原材料运输数据是否齐全 1-是 0-否
+ */
+ private String transportationDataComplete;
+ /**
+ * 是否做过ISO 14064-1温室气体盘查 1-是 0-否
+ */
+ private String isUseIso;
+ /**
+ * 当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他
+ */
+ private String currentEnergySource;
+ /**
+ * 当前能源使用来源其他信息填写
+ */
+ private String currentEnergyOther;
+ /**
+ * 工厂名称(中文)
+ */
+ private String factoryNameCn;
+ /**
+ * 工厂名称(英文)
+ */
+ private String factoryNameEn;
+ /**
+ * 工厂地址(中文)
+ */
+ private String factoryAddressCn;
+ /**
+ * 工厂地址(英文)
+ */
+ private String factoryAddressEn;
+ /**
+ * 是否做过碳足迹盘查 1-是 0-否
+ */
+ private String isCarbonCheck;
+ /**
+ * 申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓
+ */
+ private String checkType;
+ /**
+ * 委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级
+ */
+ private String expectedCheckLevel;
+ /**
+ * 核查过程所使用的语言
+ */
+ private String language;
+ /**
+ * 接受核查的产品名称(中文)
+ */
+ private String productNameCn;
+ /**
+ * 接受核查的产品名称(英文)
+ */
+ private String productNameEn;
+ /**
+ * 接受核查的产品型号(中文)
+ */
+ private String productModelCn;
+ /**
+ * 接受核查的产品型号(英文)
+ */
+ private String productModelEn;
+ /**
+ * 产品碳足迹数据开始时间
+ */
+ private String startDate;
+ /**
+ * 产品碳足迹数据结束时间
+ */
+ private String endDate;
+ /**
+ * 希望文件评审的日期
+ */
+ private String fileReviewDate;
+ /**
+ * 希望提交核查陈述的日期
+ */
+ private String statementSubmissionDate;
+ /**
+ * 希望实施现场核查的日期
+ */
+ private String onSiteCheckDate;
+ /**
+ * 希望发布最终证书的日期
+ */
+ private String certificateReleaseDate;
+ /**
+ * 其他要求
+ */
+ private String otherRequirements;
+ /**
+ * 是否已经编制过GHG清单 1-是 0-否
+ */
+ private String ghgInventoryPrepared;
+ /**
+ * GHG清单所覆盖的时间段
+ */
+ private String ghgInventoryCoveredPeriod;
+ /**
+ * 需要特殊关注的事项
+ */
+ private String specialAttention;
+ /**
+ * 工艺流程简述
+ */
+ private String processDescription;
+ /**
+ * 产品信息
+ */
+ private String productInfo;
+ /**
+ * 公司简介
+ */
+ private String companyInfo;
+ /**
+ * 盘查期间场内平均人数
+ */
+ private String avgPersonNum;
+ /**
+ * 盘查期间场内平均工时
+ */
+ private String avgWorkTim;
+ /**
+ * 计量单位
+ */
+ private String measureUnit;
+ /**
+ * 待核查产品的总产量
+ */
+ private String waitProductionCapacity;
+ /**
+ * 总量单位
+ */
+ private String waitProductionUnit;
+ /**
+ * 单件重量
+ */
+ private String pieceWeight;
+ /**
+ * 单件重量单位
+ */
+ private String pieceWeightUnit;
+ /**
+ * 生产的所有产品的总产量
+ */
+ private String fullProductionCapacity;
+ /**
+ * 生产的所有产品的总产量单位
+ */
+ private String fullProductionUnit;
+ /**
+ * 审核主管
+ */
+ private String checkExecutive;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * email
+ */
+ private String email;
+ /**
+ * 主键id
+ */
+ private Long id;
+ /**
+ * 租户编码
+ */
+ private Long tenantCode;
+ /**
+ * 企业id
+ */
+ private Long companyId;
+ /**
+ * 创建人
+ */
+ private Long creator;
+ /**
+ * 创建时间
+ */
+ private Long createDate;
+ /**
+ * 更新人
+ */
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ private Long updateDate;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java
new file mode 100644
index 0000000..bb2a2b0
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 申请表基础数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonReportMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java
new file mode 100644
index 0000000..bcf4be3
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
+
+/**
+ * 申请表基础数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonReportService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
new file mode 100644
index 0000000..2d5a294
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 申请表基础数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonReportServiceImpl extends BaseServiceImpl implements CqcCarbonReportService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java
new file mode 100644
index 0000000..922d3cb
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonRaw.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 原物料阶段数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonRawMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java
new file mode 100644
index 0000000..196a81d
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonRaw.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+
+/**
+ * 原物料阶段数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonRawService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
new file mode 100644
index 0000000..a1e0440
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonRaw.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper;
+import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity;
+import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 原物料阶段数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonRawServiceImpl extends BaseServiceImpl implements CqcCarbonRawService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java
new file mode 100644
index 0000000..3c15f43
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java
@@ -0,0 +1,98 @@
+package com.thing.cqc.CqcCarbonReport.controller;
+
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+import com.thing.cqc.CqcCarbonReport.dto.CqcCarbonReportDTO;
+import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+* 申请表基础数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@RestController
+@RequestMapping("v2/cqccarbonreport")
+@Tag(name="申请表基础数据")
+@RequiredArgsConstructor
+public class CqcCarbonReportController {
+
+ private final CqcCarbonReportService cqcCarbonReportService;
+
+ @GetMapping("page")
+ @Operation(summary="分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
+ })
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
+ PageData page = cqcCarbonReportService.getPageData(params, CqcCarbonReportDTO.class);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary="信息")
+ public Result get(@PathVariable("id") Long id){
+ CqcCarbonReportDTO data = cqcCarbonReportService.getByIdAs(id, CqcCarbonReportDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @Operation(summary="保存")
+ @LogOperation("保存")
+ public Result save(@RequestBody CqcCarbonReportDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ cqcCarbonReportService.saveDto(dto);
+ return new Result<>();
+ }
+
+ @PutMapping
+ @Operation(summary="修改")
+ @LogOperation("修改")
+ public Result update(@RequestBody CqcCarbonReportDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ cqcCarbonReportService.updateDto(dto);
+ return new Result<>();
+ }
+
+ @DeleteMapping
+ @Operation(summary="删除")
+ @LogOperation("删除")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ cqcCarbonReportService.batchDelete(ids);
+ return new Result<>();
+ }
+
+ /**
+ *@GetMapping("export")
+ *@Operation(summary="导出")
+ *@LogOperation("导出")
+ *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
+ * List list = cqcCarbonReportService.listAs(params, CqcCarbonReportDTO.class);
+ * //ExcelUtils.exportExcelToTarget(response, null, "申请表基础数据", list, CqcCarbonReportExcel.class);
+ *}
+ */
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java
new file mode 100644
index 0000000..1ff9733
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java
@@ -0,0 +1,165 @@
+package com.thing.cqc.CqcCarbonReport.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 申请表基础数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Data
+@Schema(description = "申请表基础数据")
+public class CqcCarbonReportDTO implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "受理机构")
+ private String deptId;
+ @Schema(description = "申请唯一编码(自行设定规则,与文件传输接口对应)")
+ private String applyNo;
+ @Schema(description = "委托方名称(中文)")
+ private String clientNameCn;
+ @Schema(description = "委托方名称(英文)")
+ private String clientNameEn;
+ @Schema(description = "委托方地址(中文)")
+ private String clientAddressCn;
+ @Schema(description = "委托方地址(英文)")
+ private String clientAddressEn;
+ @Schema(description = "委托方邮编")
+ private String clientPostcode;
+ @Schema(description = "委托方联系人姓名")
+ private String clientContactName;
+ @Schema(description = "委托方部门")
+ private String clientDepartment;
+ @Schema(description = "委托方职务")
+ private String clientPosition;
+ @Schema(description = "委托方电话")
+ private String clientPhone;
+ @Schema(description = "委托方传真")
+ private String clientFax;
+ @Schema(description = "委托方E-MAIL")
+ private String clientEmail;
+ @Schema(description = "与受核查方的关系")
+ private String relationshipWithChecked;
+ @Schema(description = "核查涉及的企业名称(中文)")
+ private String enterpriseNameCn;
+ @Schema(description = "核查涉及的企业名称(英文)")
+ private String enterpriseNameEn;
+ @Schema(description = "核查涉及的企业地址(中文)")
+ private String enterpriseAddressCn;
+ @Schema(description = "核查涉及的企业地址(英文)")
+ private String enterpriseAddressEn;
+ @Schema(description = "企业性质 1-国企 2-私企 3-外资或合资")
+ private String enterpriseNature;
+ @Schema(description = "提供产品或服务")
+ private String offerProduct;
+ @Schema(description = "提供产品或服务的年产量")
+ private String annualProduction;
+ @Schema(description = "产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息")
+ private String supplyDataAvailable;
+ @Schema(description = "公司网址")
+ private String companyUrl;
+ @Schema(description = "原材料运输数据是否齐全 1-是 0-否")
+ private String transportationDataComplete;
+ @Schema(description = "是否做过ISO 14064-1温室气体盘查 1-是 0-否")
+ private String isUseIso;
+ @Schema(description = "当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他")
+ private String currentEnergySource;
+ @Schema(description = "当前能源使用来源其他信息填写")
+ private String currentEnergyOther;
+ @Schema(description = "工厂名称(中文)")
+ private String factoryNameCn;
+ @Schema(description = "工厂名称(英文)")
+ private String factoryNameEn;
+ @Schema(description = "工厂地址(中文)")
+ private String factoryAddressCn;
+ @Schema(description = "工厂地址(英文)")
+ private String factoryAddressEn;
+ @Schema(description = "是否做过碳足迹盘查 1-是 0-否")
+ private String isCarbonCheck;
+ @Schema(description = "申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓")
+ private String checkType;
+ @Schema(description = "委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级")
+ private String expectedCheckLevel;
+ @Schema(description = "核查过程所使用的语言")
+ private String language;
+ @Schema(description = "接受核查的产品名称(中文)")
+ private String productNameCn;
+ @Schema(description = "接受核查的产品名称(英文)")
+ private String productNameEn;
+ @Schema(description = "接受核查的产品型号(中文)")
+ private String productModelCn;
+ @Schema(description = "接受核查的产品型号(英文)")
+ private String productModelEn;
+ @Schema(description = "产品碳足迹数据开始时间")
+ private String startDate;
+ @Schema(description = "产品碳足迹数据结束时间")
+ private String endDate;
+ @Schema(description = "希望文件评审的日期")
+ private String fileReviewDate;
+ @Schema(description = "希望提交核查陈述的日期")
+ private String statementSubmissionDate;
+ @Schema(description = "希望实施现场核查的日期")
+ private String onSiteCheckDate;
+ @Schema(description = "希望发布最终证书的日期")
+ private String certificateReleaseDate;
+ @Schema(description = "其他要求")
+ private String otherRequirements;
+ @Schema(description = "是否已经编制过GHG清单 1-是 0-否")
+ private String ghgInventoryPrepared;
+ @Schema(description = "GHG清单所覆盖的时间段")
+ private String ghgInventoryCoveredPeriod;
+ @Schema(description = "需要特殊关注的事项")
+ private String specialAttention;
+ @Schema(description = "工艺流程简述")
+ private String processDescription;
+ @Schema(description = "产品信息")
+ private String productInfo;
+ @Schema(description = "公司简介")
+ private String companyInfo;
+ @Schema(description = "盘查期间场内平均人数")
+ private String avgPersonNum;
+ @Schema(description = "盘查期间场内平均工时")
+ private String avgWorkTim;
+ @Schema(description = "计量单位")
+ private String measureUnit;
+ @Schema(description = "待核查产品的总产量")
+ private String waitProductionCapacity;
+ @Schema(description = "总量单位")
+ private String waitProductionUnit;
+ @Schema(description = "单件重量")
+ private String pieceWeight;
+ @Schema(description = "单件重量单位")
+ private String pieceWeightUnit;
+ @Schema(description = "生产的所有产品的总产量")
+ private String fullProductionCapacity;
+ @Schema(description = "生产的所有产品的总产量单位")
+ private String fullProductionUnit;
+ @Schema(description = "审核主管")
+ private String checkExecutive;
+ @Schema(description = "电话")
+ private String phone;
+ @Schema(description = "email")
+ private String email;
+ @Schema(description = "主键id")
+ private Long id;
+ @Schema(description = "租户编码")
+ private Long tenantCode;
+ @Schema(description = "企业id")
+ private Long companyId;
+ @Schema(description = "创建人")
+ private Long creator;
+ @Schema(description = "创建时间")
+ private Long createDate;
+ @Schema(description = "更新人")
+ private Long updater;
+ @Schema(description = "更新时间")
+ private Long updateDate;
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java
new file mode 100644
index 0000000..d79e656
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java
@@ -0,0 +1,310 @@
+package com.thing.cqc.CqcCarbonReport.entity;
+
+import com.mybatisflex.annotation.Table;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 申请表基础数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cqc_carbon_report")
+public class CqcCarbonReportEntity implements Serializable {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 受理机构
+ */
+ private String deptId;
+ /**
+ * 申请唯一编码(自行设定规则,与文件传输接口对应)
+ */
+ private String applyNo;
+ /**
+ * 委托方名称(中文)
+ */
+ private String clientNameCn;
+ /**
+ * 委托方名称(英文)
+ */
+ private String clientNameEn;
+ /**
+ * 委托方地址(中文)
+ */
+ private String clientAddressCn;
+ /**
+ * 委托方地址(英文)
+ */
+ private String clientAddressEn;
+ /**
+ * 委托方邮编
+ */
+ private String clientPostcode;
+ /**
+ * 委托方联系人姓名
+ */
+ private String clientContactName;
+ /**
+ * 委托方部门
+ */
+ private String clientDepartment;
+ /**
+ * 委托方职务
+ */
+ private String clientPosition;
+ /**
+ * 委托方电话
+ */
+ private String clientPhone;
+ /**
+ * 委托方传真
+ */
+ private String clientFax;
+ /**
+ * 委托方E-MAIL
+ */
+ private String clientEmail;
+ /**
+ * 与受核查方的关系
+ */
+ private String relationshipWithChecked;
+ /**
+ * 核查涉及的企业名称(中文)
+ */
+ private String enterpriseNameCn;
+ /**
+ * 核查涉及的企业名称(英文)
+ */
+ private String enterpriseNameEn;
+ /**
+ * 核查涉及的企业地址(中文)
+ */
+ private String enterpriseAddressCn;
+ /**
+ * 核查涉及的企业地址(英文)
+ */
+ private String enterpriseAddressEn;
+ /**
+ * 企业性质 1-国企 2-私企 3-外资或合资
+ */
+ private String enterpriseNature;
+ /**
+ * 提供产品或服务
+ */
+ private String offerProduct;
+ /**
+ * 提供产品或服务的年产量
+ */
+ private String annualProduction;
+ /**
+ * 产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息
+ */
+ private String supplyDataAvailable;
+ /**
+ * 公司网址
+ */
+ private String companyUrl;
+ /**
+ * 原材料运输数据是否齐全 1-是 0-否
+ */
+ private String transportationDataComplete;
+ /**
+ * 是否做过ISO 14064-1温室气体盘查 1-是 0-否
+ */
+ private String isUseIso;
+ /**
+ * 当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他
+ */
+ private String currentEnergySource;
+ /**
+ * 当前能源使用来源其他信息填写
+ */
+ private String currentEnergyOther;
+ /**
+ * 工厂名称(中文)
+ */
+ private String factoryNameCn;
+ /**
+ * 工厂名称(英文)
+ */
+ private String factoryNameEn;
+ /**
+ * 工厂地址(中文)
+ */
+ private String factoryAddressCn;
+ /**
+ * 工厂地址(英文)
+ */
+ private String factoryAddressEn;
+ /**
+ * 是否做过碳足迹盘查 1-是 0-否
+ */
+ private String isCarbonCheck;
+ /**
+ * 申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓
+ */
+ private String checkType;
+ /**
+ * 委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级
+ */
+ private String expectedCheckLevel;
+ /**
+ * 核查过程所使用的语言
+ */
+ private String language;
+ /**
+ * 接受核查的产品名称(中文)
+ */
+ private String productNameCn;
+ /**
+ * 接受核查的产品名称(英文)
+ */
+ private String productNameEn;
+ /**
+ * 接受核查的产品型号(中文)
+ */
+ private String productModelCn;
+ /**
+ * 接受核查的产品型号(英文)
+ */
+ private String productModelEn;
+ /**
+ * 产品碳足迹数据开始时间
+ */
+ private String startDate;
+ /**
+ * 产品碳足迹数据结束时间
+ */
+ private String endDate;
+ /**
+ * 希望文件评审的日期
+ */
+ private String fileReviewDate;
+ /**
+ * 希望提交核查陈述的日期
+ */
+ private String statementSubmissionDate;
+ /**
+ * 希望实施现场核查的日期
+ */
+ private String onSiteCheckDate;
+ /**
+ * 希望发布最终证书的日期
+ */
+ private String certificateReleaseDate;
+ /**
+ * 其他要求
+ */
+ private String otherRequirements;
+ /**
+ * 是否已经编制过GHG清单 1-是 0-否
+ */
+ private String ghgInventoryPrepared;
+ /**
+ * GHG清单所覆盖的时间段
+ */
+ private String ghgInventoryCoveredPeriod;
+ /**
+ * 需要特殊关注的事项
+ */
+ private String specialAttention;
+ /**
+ * 工艺流程简述
+ */
+ private String processDescription;
+ /**
+ * 产品信息
+ */
+ private String productInfo;
+ /**
+ * 公司简介
+ */
+ private String companyInfo;
+ /**
+ * 盘查期间场内平均人数
+ */
+ private String avgPersonNum;
+ /**
+ * 盘查期间场内平均工时
+ */
+ private String avgWorkTim;
+ /**
+ * 计量单位
+ */
+ private String measureUnit;
+ /**
+ * 待核查产品的总产量
+ */
+ private String waitProductionCapacity;
+ /**
+ * 总量单位
+ */
+ private String waitProductionUnit;
+ /**
+ * 单件重量
+ */
+ private String pieceWeight;
+ /**
+ * 单件重量单位
+ */
+ private String pieceWeightUnit;
+ /**
+ * 生产的所有产品的总产量
+ */
+ private String fullProductionCapacity;
+ /**
+ * 生产的所有产品的总产量单位
+ */
+ private String fullProductionUnit;
+ /**
+ * 审核主管
+ */
+ private String checkExecutive;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * email
+ */
+ private String email;
+ /**
+ * 主键id
+ */
+ private Long id;
+ /**
+ * 租户编码
+ */
+ private Long tenantCode;
+ /**
+ * 企业id
+ */
+ private Long companyId;
+ /**
+ * 创建人
+ */
+ private Long creator;
+ /**
+ * 创建时间
+ */
+ private Long createDate;
+ /**
+ * 更新人
+ */
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ private Long updateDate;
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java
new file mode 100644
index 0000000..4fe6c55
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java
@@ -0,0 +1,16 @@
+package com.thing.cqc.CqcCarbonReport.mapper;
+
+import com.thing.common.orm.mapper.PowerBaseMapper;
+import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 申请表基础数据
+*
+* @author xc
+* @since 3.0 2024-08-08
+*/
+@Mapper
+public interface CqcCarbonReportMapper extends PowerBaseMapper {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java
new file mode 100644
index 0000000..157d1b2
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java
@@ -0,0 +1,14 @@
+package com.thing.cqc.CqcCarbonReport.service;
+
+import com.thing.common.orm.service.IBaseService;
+import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
+
+/**
+ * 申请表基础数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+public interface CqcCarbonReportService extends IBaseService {
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
new file mode 100644
index 0000000..3a357ad
--- /dev/null
+++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java
@@ -0,0 +1,28 @@
+package com.thing.cqc.CqcCarbonReport.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+import com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper;
+import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity;
+import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 申请表基础数据
+ *
+ * @author xc
+ * @since 3.0 2024-08-08
+ */
+@Service
+public class CqcCarbonReportServiceImpl extends BaseServiceImpl implements CqcCarbonReportService {
+
+ @Override
+ public QueryWrapper getWrapper(Map params){
+ QueryWrapper wrapper = new QueryWrapper();
+ return wrapper;
+ }
+
+
+}
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml
new file mode 100644
index 0000000..bb08a24
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml
new file mode 100644
index 0000000..bdb6f7e
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml
new file mode 100644
index 0000000..4a9a35d
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml
new file mode 100644
index 0000000..1c253cc
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml
new file mode 100644
index 0000000..20d88c9
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml
new file mode 100644
index 0000000..39c14ff
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml
new file mode 100644
index 0000000..7302bcf
--- /dev/null
+++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/pom.xml b/modules/pom.xml
index 6b5f88b..a2638c2 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -27,6 +27,7 @@
equipment
carbon-track
carbon-public
+ cqc-service
modules
diff --git a/pom.xml b/pom.xml
index e660df1..ae0aa28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -621,7 +621,11 @@
carbon-public
${project.version}
-
+
+ com.thing.modules
+ cqc-service
+ ${project.version}
+
com.thing.tools