能源费率详情——能源费率+子表 通过id查询

module_base/src/main/java/org/jeecg/modules/energyRate/controller/EnergyRateController.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.jeecg.modules.energyRate.convert.EnergyRatePageConvert;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -54,6 +55,26 @@ public class EnergyRateController {
 	@Autowired
 	private IEnergyRateDetailService energyRateDetailService;
 
+	 /**
+	  * 能源费率详情——能源费率+子表
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @ApiOperation(value="能源费率详情——能源费率+子表 通过id查询", notes="能源费率详情——能源费率+子表 通过id查询")
+	 @GetMapping(value = "/xqqueryById")
+	 public Result<EnergyRatePage> xqqueryById(@RequestParam(name="id",required=true) String id) {
+		 EnergyRate energyRate = energyRateService.getById(id);
+		 if(energyRate ==null) {
+			 return Result.error("未找到对应数据");
+		 }
+		 List<EnergyRateDetail> energyRateDetailList = energyRateDetailService.selectByMainId(id);
+		 EnergyRatePage energyRatePage = EnergyRatePageConvert.INSTANCE.convert(energyRate,energyRateDetailList);
+		 return Result.OK(energyRatePage);
+
+	 }
+
+
 	/**
 	 * 分页列表查询
 	 *

module_base/src/main/java/org/jeecg/modules/energyRate/convert/EnergyRatePageConvert.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.energyRate.convert;
+
+import org.jeecg.modules.energyRate.entity.EnergyRate;
+import org.jeecg.modules.energyRate.entity.EnergyRateDetail;
+import org.jeecg.modules.energyRate.vo.EnergyRatePage;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface EnergyRatePageConvert {
+
+    EnergyRatePageConvert INSTANCE = Mappers.getMapper(EnergyRatePageConvert.class);
+
+    EnergyRatePage convert(EnergyRate energyRate, List<EnergyRateDetail> baseEnergyRateDetailList);
+
+}