cqc报表填报代码提交

modules/cqc-service/pom.xml

@@ -24,8 +24,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.thing.common</groupId>
-            <artifactId>orm</artifactId>
+            <groupId>com.thing.modules</groupId>
+            <artifactId>thing</artifactId>
         </dependency>
     </dependencies>
 </project>

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java

@@ -29,7 +29,7 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("v2/cqccarbonconsumables")
-@Tag(name="使用阶段耗材信息")
+@Tag(name="碳足迹认证核查-使用阶段耗材")
 @RequiredArgsConstructor
 public class CqcCarbonConsumablesController {
     

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java

@@ -1,5 +1,6 @@
 package com.thing.cqc.CqcCarbonConsumables.entity;
 
+import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 
 import lombok.Data;
@@ -26,6 +27,7 @@ public class CqcCarbonConsumablesEntity implements Serializable {
 	/**
 	 * 唯一标识符
 	 */
+	@Id
 	private Long id;
 	/**
 	 * 申请编号

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java

@@ -29,7 +29,7 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("v2/cqccarbondiscard")
-@Tag(name="废物处置及再利用信息")
+@Tag(name="碳足迹认证核查-废物处置阶段")
 @RequiredArgsConstructor
 public class CqcCarbonDiscardController {
     

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java

@@ -1,5 +1,6 @@
 package com.thing.cqc.CqcCarbonDiscard.entity;
 
+import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 
 import lombok.Data;

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java

@@ -29,7 +29,7 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("v2/cqccarbondistribution")
-@Tag(name="产品分销信息")
+@Tag(name="碳足迹认证核查-分销阶段")
 @RequiredArgsConstructor
 public class CqcCarbonDistributionController {
     

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java

@@ -1,5 +1,6 @@
 package com.thing.cqc.CqcCarbonDistribution.entity;
 
+import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 
 import lombok.Data;

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java

@@ -29,7 +29,7 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("v2/cqccarbonenergy")
-@Tag(name=" 使用阶段能源信息")
+@Tag(name=" 碳足迹认证核查-使用阶段")
 @RequiredArgsConstructor
 public class CqcCarbonEnergyController {
     

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java

@@ -1,5 +1,6 @@
 package com.thing.cqc.CqcCarbonEnergy.entity;
 
+import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 
 import lombok.Data;

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java

@@ -29,7 +29,7 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("v2/cqccarbonmake")
-@Tag(name="制造阶段能源消耗信息")
+@Tag(name="碳足迹认证核查-制造阶段")
 @RequiredArgsConstructor
 public class CqcCarbonMakeController {
     

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java

@@ -1,5 +1,6 @@
 package com.thing.cqc.CqcCarbonMake.entity;
 
+import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 
 import lombok.Data;

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java

@@ -11,7 +11,6 @@ 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;
@@ -29,7 +28,7 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("v2/cqccarbonraw")
-@Tag(name="原物料阶段数据")
+@Tag(name="碳足迹认证喝茶-原物料阶段")
 @RequiredArgsConstructor
 public class CqcCarbonRawController {
     

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java

@@ -1,5 +1,6 @@
 package com.thing.cqc.CqcCarbonRaw.entity;
 
+import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 
 import lombok.Data;

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java

@@ -1,96 +0,0 @@
-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<PageData<CqcCarbonConsumablesDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CqcCarbonConsumablesDTO> page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class);
-        return new Result<PageData<CqcCarbonConsumablesDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    @Operation(summary="信息")
-    public Result<CqcCarbonConsumablesDTO> get(@PathVariable("id") Long id){
-        CqcCarbonConsumablesDTO data = cqcCarbonConsumablesService.getByIdAs(id, CqcCarbonConsumablesDTO.class);
-        return new Result<CqcCarbonConsumablesDTO>().ok(data);
-    }
-
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CqcCarbonConsumablesDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cqcCarbonConsumablesService.saveDto(dto);
-        return new Result<>();
-    }
-
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CqcCarbonConsumablesDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cqcCarbonConsumablesService.updateDto(dto);
-        return new Result<>();
-    }
-
-    @DeleteMapping
-    @Operation(summary="删除")
-    @LogOperation("删除")
-    public Result<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-      *  List<CqcCarbonConsumablesDTO> list = cqcCarbonConsumablesService.listAs(params, CqcCarbonConsumablesDTO.class);
-      *  //ExcelUtils.exportExcelToTarget(response, null, "使用阶段耗材信息", list, CqcCarbonConsumablesExcel.class);
-      *}
-      */
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java

@@ -1,70 +0,0 @@
-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;
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java

@@ -1,121 +0,0 @@
-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;
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java

@@ -1,16 +0,0 @@
-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<CqcCarbonConsumablesEntity> {
-	
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java

@@ -1,14 +0,0 @@
-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<CqcCarbonConsumablesEntity> {
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java

@@ -1,28 +0,0 @@
-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<CqcCarbonConsumablesMapper, CqcCarbonConsumablesEntity> implements CqcCarbonConsumablesService {
-
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params){
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java

@@ -1,96 +0,0 @@
-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<PageData<CqcCarbonDiscardDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CqcCarbonDiscardDTO> page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class);
-        return new Result<PageData<CqcCarbonDiscardDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    @Operation(summary="信息")
-    public Result<CqcCarbonDiscardDTO> get(@PathVariable("id") Long id){
-        CqcCarbonDiscardDTO data = cqcCarbonDiscardService.getByIdAs(id, CqcCarbonDiscardDTO.class);
-        return new Result<CqcCarbonDiscardDTO>().ok(data);
-    }
-
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CqcCarbonDiscardDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cqcCarbonDiscardService.saveDto(dto);
-        return new Result<>();
-    }
-
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CqcCarbonDiscardDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cqcCarbonDiscardService.updateDto(dto);
-        return new Result<>();
-    }
-
-    @DeleteMapping
-    @Operation(summary="删除")
-    @LogOperation("删除")
-    public Result<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-      *  List<CqcCarbonDiscardDTO> list = cqcCarbonDiscardService.listAs(params, CqcCarbonDiscardDTO.class);
-      *  //ExcelUtils.exportExcelToTarget(response, null, "废物处置及再利用信息", list, CqcCarbonDiscardExcel.class);
-      *}
-      */
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java

@@ -1,70 +0,0 @@
-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;
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java

@@ -1,122 +0,0 @@
-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;
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java

@@ -1,16 +0,0 @@
-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<CqcCarbonDiscardEntity> {
-	
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java

@@ -1,14 +0,0 @@
-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<CqcCarbonDiscardEntity> {
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java

@@ -1,28 +0,0 @@
-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<CqcCarbonDiscardMapper, CqcCarbonDiscardEntity> implements CqcCarbonDiscardService {
-
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params){
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java

@@ -1,96 +0,0 @@
-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<PageData<CqcCarbonDistributionDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CqcCarbonDistributionDTO> page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class);
-        return new Result<PageData<CqcCarbonDistributionDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    @Operation(summary="信息")
-    public Result<CqcCarbonDistributionDTO> get(@PathVariable("id") Long id){
-        CqcCarbonDistributionDTO data = cqcCarbonDistributionService.getByIdAs(id, CqcCarbonDistributionDTO.class);
-        return new Result<CqcCarbonDistributionDTO>().ok(data);
-    }
-
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CqcCarbonDistributionDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cqcCarbonDistributionService.saveDto(dto);
-        return new Result<>();
-    }
-
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CqcCarbonDistributionDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cqcCarbonDistributionService.updateDto(dto);
-        return new Result<>();
-    }
-
-    @DeleteMapping
-    @Operation(summary="删除")
-    @LogOperation("删除")
-    public Result<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-      *  List<CqcCarbonDistributionDTO> list = cqcCarbonDistributionService.listAs(params, CqcCarbonDistributionDTO.class);
-      *  //ExcelUtils.exportExcelToTarget(response, null, "产品分销信息", list, CqcCarbonDistributionExcel.class);
-      *}
-      */
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java

@@ -1,58 +0,0 @@
-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;
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java

@@ -1,98 +0,0 @@
-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;
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java

@@ -1,16 +0,0 @@
-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<CqcCarbonDistributionEntity> {
-	
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java

@@ -1,14 +0,0 @@
-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<CqcCarbonDistributionEntity> {
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java

@@ -1,28 +0,0 @@
-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<CqcCarbonDistributionMapper, CqcCarbonDistributionEntity> implements CqcCarbonDistributionService {
-
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params){
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java

@@ -1,96 +0,0 @@
-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<PageData<CqcCarbonEnergyDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CqcCarbonEnergyDTO> page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class);
-        return new Result<PageData<CqcCarbonEnergyDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    @Operation(summary="信息")
-    public Result<CqcCarbonEnergyDTO> get(@PathVariable("id") Long id){
-        CqcCarbonEnergyDTO data = cqcCarbonEnergyService.getByIdAs(id, CqcCarbonEnergyDTO.class);
-        return new Result<CqcCarbonEnergyDTO>().ok(data);
-    }
-
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CqcCarbonEnergyDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cqcCarbonEnergyService.saveDto(dto);
-        return new Result<>();
-    }
-
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CqcCarbonEnergyDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cqcCarbonEnergyService.updateDto(dto);
-        return new Result<>();
-    }
-
-    @DeleteMapping
-    @Operation(summary="删除")
-    @LogOperation("删除")
-    public Result<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-      *  List<CqcCarbonEnergyDTO> list = cqcCarbonEnergyService.listAs(params, CqcCarbonEnergyDTO.class);
-      *  //ExcelUtils.exportExcelToTarget(response, null, " 使用阶段能源信息", list, CqcCarbonEnergyExcel.class);
-      *}
-      */
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java

@@ -1,54 +0,0 @@
-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;
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java

@@ -1,90 +0,0 @@
-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;
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java

@@ -1,16 +0,0 @@
-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<CqcCarbonEnergyEntity> {
-	
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java

@@ -1,14 +0,0 @@
-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<CqcCarbonEnergyEntity> {
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java

@@ -1,28 +0,0 @@
-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<CqcCarbonEnergyMapper, CqcCarbonEnergyEntity> implements CqcCarbonEnergyService {
-
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params){
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java

@@ -1,96 +0,0 @@
-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<PageData<CqcCarbonMakeDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CqcCarbonMakeDTO> page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class);
-        return new Result<PageData<CqcCarbonMakeDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    @Operation(summary="信息")
-    public Result<CqcCarbonMakeDTO> get(@PathVariable("id") Long id){
-        CqcCarbonMakeDTO data = cqcCarbonMakeService.getByIdAs(id, CqcCarbonMakeDTO.class);
-        return new Result<CqcCarbonMakeDTO>().ok(data);
-    }
-
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CqcCarbonMakeDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cqcCarbonMakeService.saveDto(dto);
-        return new Result<>();
-    }
-
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CqcCarbonMakeDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cqcCarbonMakeService.updateDto(dto);
-        return new Result<>();
-    }
-
-    @DeleteMapping
-    @Operation(summary="删除")
-    @LogOperation("删除")
-    public Result<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-      *  List<CqcCarbonMakeDTO> list = cqcCarbonMakeService.listAs(params, CqcCarbonMakeDTO.class);
-      *  //ExcelUtils.exportExcelToTarget(response, null, "制造阶段能源消耗信息", list, CqcCarbonMakeExcel.class);
-      *}
-      */
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java

@@ -1,52 +0,0 @@
-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;
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java

@@ -1,86 +0,0 @@
-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;
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java

@@ -1,16 +0,0 @@
-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<CqcCarbonMakeEntity> {
-	
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java

@@ -1,14 +0,0 @@
-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<CqcCarbonMakeEntity> {
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java

@@ -1,28 +0,0 @@
-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<CqcCarbonMakeMapper, CqcCarbonMakeEntity> implements CqcCarbonMakeService {
-
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params){
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java

@@ -1,96 +0,0 @@
-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<PageData<CqcCarbonRawDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CqcCarbonRawDTO> page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class);
-        return new Result<PageData<CqcCarbonRawDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    @Operation(summary="信息")
-    public Result<CqcCarbonRawDTO> get(@PathVariable("id") Long id){
-        CqcCarbonRawDTO data = cqcCarbonRawService.getByIdAs(id, CqcCarbonRawDTO.class);
-        return new Result<CqcCarbonRawDTO>().ok(data);
-    }
-
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CqcCarbonRawDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cqcCarbonRawService.saveDto(dto);
-        return new Result<>();
-    }
-
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CqcCarbonRawDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cqcCarbonRawService.updateDto(dto);
-        return new Result<>();
-    }
-
-    @DeleteMapping
-    @Operation(summary="删除")
-    @LogOperation("删除")
-    public Result<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-      *  List<CqcCarbonRawDTO> list = cqcCarbonRawService.listAs(params, CqcCarbonRawDTO.class);
-      *  //ExcelUtils.exportExcelToTarget(response, null, "原物料阶段数据", list, CqcCarbonRawExcel.class);
-      *}
-      */
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java

@@ -1,70 +0,0 @@
-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;
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java

@@ -1,122 +0,0 @@
-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;
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java

@@ -1,16 +0,0 @@
-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<CqcCarbonRawEntity> {
-	
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java

@@ -1,14 +0,0 @@
-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<CqcCarbonRawEntity> {
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java

@@ -1,28 +0,0 @@
-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<CqcCarbonRawMapper, CqcCarbonRawEntity> implements CqcCarbonRawService {
-
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params){
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java

@@ -1,96 +0,0 @@
-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<PageData<CqcCarbonReportDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CqcCarbonReportDTO> page = cqcCarbonReportService.getPageData(params, CqcCarbonReportDTO.class);
-        return new Result<PageData<CqcCarbonReportDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    @Operation(summary="信息")
-    public Result<CqcCarbonReportDTO> get(@PathVariable("id") Long id){
-        CqcCarbonReportDTO data = cqcCarbonReportService.getByIdAs(id, CqcCarbonReportDTO.class);
-        return new Result<CqcCarbonReportDTO>().ok(data);
-    }
-
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CqcCarbonReportDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cqcCarbonReportService.saveDto(dto);
-        return new Result<>();
-    }
-
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CqcCarbonReportDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cqcCarbonReportService.updateDto(dto);
-        return new Result<>();
-    }
-
-    @DeleteMapping
-    @Operation(summary="删除")
-    @LogOperation("删除")
-    public Result<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-      *  List<CqcCarbonReportDTO> list = cqcCarbonReportService.listAs(params, CqcCarbonReportDTO.class);
-      *  //ExcelUtils.exportExcelToTarget(response, null, "申请表基础数据", list, CqcCarbonReportExcel.class);
-      *}
-      */
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java

@@ -1,164 +0,0 @@
-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;
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java

@@ -1,309 +0,0 @@
-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;
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java

@@ -1,16 +0,0 @@
-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<CqcCarbonReportEntity> {
-	
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java

@@ -1,14 +0,0 @@
-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<CqcCarbonReportEntity> {
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java

@@ -1,28 +0,0 @@
-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<CqcCarbonReportMapper, CqcCarbonReportEntity> implements CqcCarbonReportService {
-
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params){
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-
-
-}

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java

@@ -20,6 +20,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
+import java.util.UUID;
 
 /**
 * 申请表基础数据
@@ -29,7 +30,7 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("v2/cqccarbonreport")
-@Tag(name="申请表基础数据")
+@Tag(name="碳足迹认证核查-基本信息")
 @RequiredArgsConstructor
 public class CqcCarbonReportController {
     
@@ -58,21 +59,22 @@ public class CqcCarbonReportController {
     @PostMapping
     @Operation(summary="保存")
     @LogOperation("保存")
-    public Result<Void> save(@RequestBody CqcCarbonReportDTO dto){
+    public Result<Object> save(@RequestBody CqcCarbonReportDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        dto.setApplyNo(String.valueOf(UUID.randomUUID()));
         cqcCarbonReportService.saveDto(dto);
-        return new Result<>();
+        return new Result<Object>().ok(dto.getApplyNo());
     }
 
     @PutMapping
     @Operation(summary="修改")
     @LogOperation("修改")
-    public Result<Void> update(@RequestBody CqcCarbonReportDTO dto){
+    public Result<Object> update(@RequestBody CqcCarbonReportDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         cqcCarbonReportService.updateDto(dto);
-        return new Result<>();
+        return new Result<Object>().ok(dto.getApplyNo());
     }
 
     @DeleteMapping

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java

@@ -51,6 +51,8 @@ public class CqcCarbonReportDTO implements Serializable {
     private String enterpriseNameCn;
     @Schema(description = "核查涉及的企业名称（英文）")
     private String enterpriseNameEn;
+    @Schema(description = "统一社会信用代码")
+    private String corporationCode;
     @Schema(description = "核查涉及的企业地址（中文）")
     private String enterpriseAddressCn;
     @Schema(description = "核查涉及的企业地址（英文）")
@@ -147,6 +149,8 @@ public class CqcCarbonReportDTO implements Serializable {
     private String phone;
     @Schema(description = "email")
     private String email;
+    @Schema(description = "审核状态")
+    private String status;
     @Schema(description = "主键id")
     private Long id;
     @Schema(description = "租户编码")

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java

@@ -87,6 +87,10 @@ public class CqcCarbonReportEntity implements Serializable {
 	 * 核查涉及的企业名称（英文）
 	 */
 	private String enterpriseNameEn;
+	/**
+	 * 统一社会信用代码
+	 */
+	private String corporationCode;
 	/**
 	 * 核查涉及的企业地址（中文）
 	 */
@@ -283,6 +287,10 @@ public class CqcCarbonReportEntity implements Serializable {
 	 * 主键id
 	 */
 	private Long id;
+	/**
+	 * 审核状态
+	 */
+	private String status;
 	/**
 	 * 租户编码
 	 */

modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java

@@ -5,6 +5,7 @@ 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 com.thing.sys.security.context.UserContext;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -21,6 +22,10 @@ public class CqcCarbonReportServiceImpl extends BaseServiceImpl<CqcCarbonReportM
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params){
         QueryWrapper wrapper = new QueryWrapper();
+        Long tenantCode = UserContext.getTenantCode();
+        if(!tenantCode.equals(1001L)){
+            wrapper.eq(CqcCarbonReportEntity::getTenantCode,tenantCode);
+        }
         return wrapper;
     }