From c85d1bcab2888ed87a4948ba0fcb98402f0e7a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Sun, 31 Aug 2025 16:02:38 +0800 Subject: [PATCH] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../farm/service/modelmanagement/ModelManagementServiceImpl.java | 1 - .../src/main/resources/mapper/modelcycle/ModelCycleMapper.xml | 1 + .../mapper/modelenvironmentindex/ModelEnvironmentIndexMapper.xml | 1 + .../mapper/modelfarmingoperation/ModelFarmingOperationMapper.xml | 1 + .../ModelFarmingOperationInputMapper.xml | 1 + .../mapper/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.xml | 1 + .../mapper/modelweatherdisaster/ModelWeatherDisasterMapper.xml | 1 + 7 files changed, 6 insertions(+), 1 deletion(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java index 94f40182..a9f0cf41 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java @@ -261,7 +261,6 @@ public class ModelManagementServiceImpl implements ModelManagementService { public ModelManagementRespVO getModelManagement(String id) { List dictDOList = sysDictService.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4); Map dictMap = dictDOList.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField2Code, SysDictDO::getField2Name, (v1, v2) -> v1)); - DisasterDataReqVO reqVO = new DisasterDataReqVO(); reqVO.setType(WEATHER_DISASTER); List weatherDisasterDataList = disasterDataService.getDisasterDataList(reqVO); diff --git a/yudao-module-farm/src/main/resources/mapper/modelcycle/ModelCycleMapper.xml b/yudao-module-farm/src/main/resources/mapper/modelcycle/ModelCycleMapper.xml index a606e5ab..e124097d 100644 --- a/yudao-module-farm/src/main/resources/mapper/modelcycle/ModelCycleMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/modelcycle/ModelCycleMapper.xml @@ -15,5 +15,6 @@ from farm_model_cycle where model_id = #{modelId} and deleted = 0 + ORDER BY create_time \ No newline at end of file diff --git a/yudao-module-farm/src/main/resources/mapper/modelenvironmentindex/ModelEnvironmentIndexMapper.xml b/yudao-module-farm/src/main/resources/mapper/modelenvironmentindex/ModelEnvironmentIndexMapper.xml index 2a25ced1..4eaa1574 100644 --- a/yudao-module-farm/src/main/resources/mapper/modelenvironmentindex/ModelEnvironmentIndexMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/modelenvironmentindex/ModelEnvironmentIndexMapper.xml @@ -15,5 +15,6 @@ from farm_model_environment_index where cycle_id = #{cycleId} and deleted = 0 + ORDER BY create_time \ No newline at end of file diff --git a/yudao-module-farm/src/main/resources/mapper/modelfarmingoperation/ModelFarmingOperationMapper.xml b/yudao-module-farm/src/main/resources/mapper/modelfarmingoperation/ModelFarmingOperationMapper.xml index 2ca34065..cf572223 100644 --- a/yudao-module-farm/src/main/resources/mapper/modelfarmingoperation/ModelFarmingOperationMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/modelfarmingoperation/ModelFarmingOperationMapper.xml @@ -15,5 +15,6 @@ from farm_model_farming_operation where cycle_id = #{cycleId} and deleted = 0 + ORDER BY create_time \ No newline at end of file diff --git a/yudao-module-farm/src/main/resources/mapper/modelfarmingoperationinput/ModelFarmingOperationInputMapper.xml b/yudao-module-farm/src/main/resources/mapper/modelfarmingoperationinput/ModelFarmingOperationInputMapper.xml index caa8d8e0..bf8551f9 100644 --- a/yudao-module-farm/src/main/resources/mapper/modelfarmingoperationinput/ModelFarmingOperationInputMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/modelfarmingoperationinput/ModelFarmingOperationInputMapper.xml @@ -16,6 +16,7 @@ from farm_model_farming_operation_input where farming_id = #{farmingId} and deleted = 0 + ORDER BY create_time diff --git a/yudao-module-farm/src/main/resources/mapper/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.xml b/yudao-module-farm/src/main/resources/mapper/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.xml index 9fe341a0..3d3e591c 100644 --- a/yudao-module-farm/src/main/resources/mapper/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/modelpestdiseaseweed/ModelPestDiseaseWeedMapper.xml @@ -15,5 +15,6 @@ from farm_model_pest_disease_weed where cycle_id = #{cycleId} and deleted = 0 + ORDER BY create_time \ No newline at end of file diff --git a/yudao-module-farm/src/main/resources/mapper/modelweatherdisaster/ModelWeatherDisasterMapper.xml b/yudao-module-farm/src/main/resources/mapper/modelweatherdisaster/ModelWeatherDisasterMapper.xml index 72871b62..893482e5 100644 --- a/yudao-module-farm/src/main/resources/mapper/modelweatherdisaster/ModelWeatherDisasterMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/modelweatherdisaster/ModelWeatherDisasterMapper.xml @@ -15,5 +15,6 @@ from farm_model_weather_disaster where cycle_id = #{cycleId} and deleted = 0 + ORDER BY create_time \ No newline at end of file