diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java index 1f7c1f4f..4ed5aa73 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java @@ -8,6 +8,10 @@ import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.Farmin import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordRespVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordCreateReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.ChartCommonReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.FarmTypeChartRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.InputUsageChartRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.PlantingAreaChartRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import cn.iocoder.yudao.module.farm.enums.CommonConstants; import cn.iocoder.yudao.module.farm.service.cropFarmingCenter.CropFarmingCenterService; @@ -263,8 +267,29 @@ public class CropFarmingCenterController { @Operation(summary = "农事报表") @GetMapping("/farming-report/1") - public CommonResult getFarmReport(FarmingReport1ReqVO req) { - FarmingReport1RespVO res = null; + public CommonResult> getFarmReport(FarmingReport1ReqVO req) { + List res = cropFarmingCenterService.getFarmReport(req); + return success(res); + } + + @Operation(summary = "农事报表-农事任务分类统计") + @GetMapping("/farming-report/chart/farm-type") + public CommonResult> getFarmTypeChart(ChartCommonReqVO req) { + List res = cropFarmingCenterService.getFarmTypeChart(req); + return success(res); + } + + @Operation(summary = "农事报表-种植类信息") + @GetMapping("/farming-report/chart/species") + public CommonResult> getPlantingAreaChart(ChartCommonReqVO req) { + List res = cropFarmingCenterService.getPlantingAreaChart(req); + return success(res); + } + + @Operation(summary = "农事报表-投入品分类统计") + @GetMapping("/farming-report/chart/input-type") + public CommonResult> getInputUsageChart(ChartCommonReqVO req) { + List res = cropFarmingCenterService.getInputUsageChart(req); return success(res); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java index 86f91c64..b2900e13 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/FarmingReport1RespVO.java @@ -17,20 +17,20 @@ import java.time.LocalDate; @AllArgsConstructor @NoArgsConstructor public class FarmingReport1RespVO { - private String id; + private String baseId; private String baseName; @Schema(description = "计划编号") private String planNumber; - @Schema(description = "排产开始日期") + @Schema(description = "开始日期") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate productionStartDate; + private LocalDate taskStartDate; - @Schema(description = "排产结束日期") + @Schema(description = "结束日期") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate productionEndDate; + private LocalDate taskEndDate; @Schema(description = "持续天数") private Integer intervalDays; @@ -42,7 +42,6 @@ public class FarmingReport1RespVO { @Schema(description = "投入品总价") private Double inputTotalPrice; - @Schema(description = "详情-用量") private Integer usageAmount; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/ChartCommonReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/ChartCommonReqVO.java new file mode 100644 index 00000000..3e904f82 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/ChartCommonReqVO.java @@ -0,0 +1,21 @@ +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: + * @author: binda + * @date: 2025/10/26 21:31 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ChartCommonReqVO { + private String baseId; + private String plotId; + private Integer yearDate; + private String state; + private String tenantId; +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/FarmTypeChartRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/FarmTypeChartRespVO.java new file mode 100644 index 00000000..a41632bd --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/FarmTypeChartRespVO.java @@ -0,0 +1,21 @@ +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: + * @author: binda + * @date: 2025/10/26 21:08 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class FarmTypeChartRespVO { + @Schema(description = "农事类型-名称") + private String farmTypeName; + @Schema(description = "农事记录数量") + private Integer recordCount; +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/InputUsageChartRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/InputUsageChartRespVO.java new file mode 100644 index 00000000..92bd09d9 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/InputUsageChartRespVO.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @description: TODO + * @author: binda + * @date: 2025/10/27 00:10 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class InputUsageChartRespVO { + @Schema(description = "投入品名称") + private String inputName; + + @Schema(description = "用量") + private Integer usageAmount; + + @Schema(description = "单位") + private Integer unit; + + @Schema(description = "总金额") + private BigDecimal totalPrice; +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/PlantingAreaChartRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/PlantingAreaChartRespVO.java new file mode 100644 index 00000000..add8bdb2 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/chart/PlantingAreaChartRespVO.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: TODO + * @author: binda + * @date: 2025/10/26 22:19 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PlantingAreaChartRespVO { + @Schema(description = "物种名称") + private String speciesName; + @Schema(description = "种植面积") + private Double plantingArea; + @Schema(description = "种植面积占比") + private String areaPercentage; +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java index 1189db98..8dc2f624 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecord/FarmingRecordMapper.java @@ -6,9 +6,13 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmingDistributionReqVO; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.FarmingDistributionRespVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.ChartCommonReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.FarmTypeChartRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 种植中心-农事基地-农事记录 Mapper * @@ -41,4 +45,6 @@ public interface FarmingRecordMapper extends BaseMapperX { } FarmingDistributionRespVO getFarmingDistributionChart(FarmingDistributionReqVO req); + + List getFarmTypeChart(ChartCommonReqVO req); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputUsageRecordsMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputUsageRecordsMapper.java index ddd7b110..ea3a6bda 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputUsageRecordsMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputUsageRecordsMapper.java @@ -4,10 +4,14 @@ package cn.iocoder.yudao.module.farm.dal.mysql.inputlibrary; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.ChartCommonReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.InputUsageChartRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.usagerecords.InputUsageRecordsPageReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputUsageRecordsDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 投入品使用记录 Mapper * @@ -28,4 +32,5 @@ public interface InputUsageRecordsMapper extends BaseMapperX getInputUsageChart(ChartCommonReqVO req); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java index b63a0da6..338864a1 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.module.farm.controller.admin.api.vo.*; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanPage2ReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.ChartCommonReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.PlantingAreaChartRespVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.productionplan.ProductionPlanPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.CropStatisticsRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO; @@ -86,4 +88,6 @@ public interface ProductionPlanMapper extends BaseMapperX { PlantingPlanCompletionRespVO getPlantingPlanCompletionChart(PlantingPlanCompletionReqVO req); List getCultivatingAreaInfo(@Param("baseId") String baseId, @Param("year") String year); + + List getPlantingAreaChart(ChartCommonReqVO req); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java index 8d8c0831..b368f20b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterService.java @@ -6,6 +6,10 @@ import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.Farmin import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordRespVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.ChartCommonReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.FarmTypeChartRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.InputUsageChartRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.PlantingAreaChartRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; import jakarta.validation.Valid; @@ -69,4 +73,12 @@ public interface CropFarmingCenterService { List getPpReport(ProductionPlanReportReqVO req); List getFcReport(FarmingRecordReportReqVO req); + + List getFarmReport(FarmingReport1ReqVO req); + + List getFarmTypeChart(ChartCommonReqVO req); + + List getPlantingAreaChart(ChartCommonReqVO req); + + List getInputUsageChart(ChartCommonReqVO req); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java index 134298ea..62dbe572 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java @@ -12,12 +12,15 @@ import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.Farmin import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordRespVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.FarmingRecordSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputSaveReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.ChartCommonReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.FarmTypeChartRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.InputUsageChartRespVO; +import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.chart.PlantingAreaChartRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO; import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; -import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO; import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO; @@ -26,6 +29,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlan import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper; import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecord.FarmingRecordMapper; +import cn.iocoder.yudao.module.farm.dal.mysql.inputlibrary.InputUsageRecordsMapper; import cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement.PersonnelManagementMapper; import cn.iocoder.yudao.module.farm.dal.mysql.productionplan.ProductionPlanMapper; import cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary.SpeciesLibraryMapper; @@ -73,6 +77,8 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { private final BaseInfoMapper baseInfoMapper; private final ProductionPlanMapper productionPlanMapper; private final FarmingRecordMapper farmingRecordMapper; + private final InputUsageRecordsMapper inputUsageRecordsMapper; + private final ModelManagementService modelManagementService; private final FarmingRecordService farmingRecordService; @@ -82,7 +88,7 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { private final FarmingTypeMaintenanceService farmingTypeMaintenanceService; public CropFarmingCenterServiceImpl(SpeciesLibraryMapper speciesLibraryMapper, PersonnelManagementMapper personnelManagementMapper, BaseInfoMapper baseInfoMapper, ProductionPlanMapper productionPlanMapper, - FarmingRecordMapper farmingRecordMapper, ModelManagementService modelManagementService, + FarmingRecordMapper farmingRecordMapper, InputUsageRecordsMapper inputUsageRecordsMapper, ModelManagementService modelManagementService, FarmingRecordService farmingRecordService, FarmingRecordInputService farmingRecordInputService, PlotInfoService plotInfoService, SpeciesLibraryService speciesLibraryService, FarmingTypeMaintenanceService farmingTypeMaintenanceService) { this.speciesLibraryMapper = speciesLibraryMapper; @@ -90,6 +96,7 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { this.baseInfoMapper = baseInfoMapper; this.productionPlanMapper = productionPlanMapper; this.farmingRecordMapper = farmingRecordMapper; + this.inputUsageRecordsMapper = inputUsageRecordsMapper; this.modelManagementService = modelManagementService; this.farmingRecordService = farmingRecordService; this.farmingRecordInputService = farmingRecordInputService; @@ -704,6 +711,34 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService { .collect(Collectors.toList()); } + @Override + public List getFarmReport(FarmingReport1ReqVO req) { + List res = new ArrayList<>(); + + List farmingRecordDOS = farmingRecordMapper.selectList(); + for (FarmingRecordDO f : farmingRecordDOS) { + + } + + return res; + } + + @Override + public List getFarmTypeChart(ChartCommonReqVO req) { + return farmingRecordMapper.getFarmTypeChart(req); + } + + @Override + public List getPlantingAreaChart(ChartCommonReqVO req) { + return productionPlanMapper.getPlantingAreaChart(req); + } + + @Override + public List getInputUsageChart(ChartCommonReqVO req) { + + return inputUsageRecordsMapper.getInputUsageChart(req); + } + private ProductionPlanReportRespVO.Models convertToModel(ProductionPlanDO plan,Map speciesName) { String plantSpeciesName = speciesName.get(plan.getPlantSpeciesCode()); String planStatusName = PLAN_MAP.get(plan.getPlanStatus()); diff --git a/yudao-module-farm/src/main/resources/mapper/farmingrecord/FarmingRecordMapper.xml b/yudao-module-farm/src/main/resources/mapper/farmingrecord/FarmingRecordMapper.xml index 516dedaf..36e6655a 100644 --- a/yudao-module-farm/src/main/resources/mapper/farmingrecord/FarmingRecordMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/farmingrecord/FarmingRecordMapper.xml @@ -24,4 +24,34 @@ AND tenant_id = #{tenantId} + + + + + \ No newline at end of file diff --git a/yudao-module-farm/src/main/resources/mapper/inputlibrary/InputUsageRecordsMapper.xml b/yudao-module-farm/src/main/resources/mapper/inputlibrary/InputUsageRecordsMapper.xml index d42589f3..c21ae0e5 100644 --- a/yudao-module-farm/src/main/resources/mapper/inputlibrary/InputUsageRecordsMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/inputlibrary/InputUsageRecordsMapper.xml @@ -9,4 +9,39 @@ 文档可见:https://www.iocoder.cn/MyBatis/x-plugins/ --> + \ No newline at end of file diff --git a/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml b/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml index 633706c7..28f207a1 100644 --- a/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml @@ -110,5 +110,55 @@ GROUP BY plant_species_code + \ No newline at end of file