boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (farm): 种植中心-农事记录

Browse Source 
- 新增农事记录 修改bug
This commit is contained in:
达富斌
2025-09-05 13:59:46 +08:00
parent 55e043b8aa
commit 5de9465171
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java
View File

@@ -7,9 +7,11 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordCreateReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO; 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.farmingrecordinput.FarmingRecordInputDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO;
import cn.iocoder.yudao.module.farm.dal.mysql.farmingnamemaintenance.FarmingNameMaintenanceMapper;
import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecord.FarmingRecordMapper; import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecord.FarmingRecordMapper;
import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecordinput.FarmingRecordInputMapper; import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecordinput.FarmingRecordInputMapper;
import cn.iocoder.yudao.module.farm.dal.mysql.farmingtypemaintenance.FarmingTypeMaintenanceMapper; import cn.iocoder.yudao.module.farm.dal.mysql.farmingtypemaintenance.FarmingTypeMaintenanceMapper;
@@ -43,6 +45,8 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
private FarmingRecordInputMapper farmingRecordInputMapper; private FarmingRecordInputMapper farmingRecordInputMapper;
@Resource @Resource
private FarmingTypeMaintenanceMapper farmingTypeMaintenanceMapper; private FarmingTypeMaintenanceMapper farmingTypeMaintenanceMapper;
@Resource
private FarmingNameMaintenanceMapper farmingNameMaintenanceMapper;
@Override @Override
public String createFarmingRecord(FarmingRecordSaveReqVO createReqVO) { public String createFarmingRecord(FarmingRecordSaveReqVO createReqVO) {
@@ -133,8 +137,8 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
// 触发任务时间和执行人集合转换，确保返回格式一致 // 触发任务时间和执行人集合转换，确保返回格式一致
farmingRecord.getTaskTimeList(); farmingRecord.getTaskTimeList();
farmingRecord.getExecutorList(); farmingRecord.getExecutorList();
FarmingTypeMaintenanceDO farmingTypeMaintenanceDO = farmingTypeMaintenanceMapper.selectOne(FarmingTypeMaintenanceDO::getFarmingCode, farmingRecord.getTaskType()); FarmingNameMaintenanceDO farmingNameMaintenanceDO = farmingNameMaintenanceMapper.selectOne(FarmingNameMaintenanceDO::getFarmingCode, farmingRecord.getTaskType());
farmingRecord.setTaskType(farmingTypeMaintenanceDO.getFarmingName()); farmingRecord.setTaskType(farmingNameMaintenanceDO.getFarmingName());
// 查询并填充投入品列表 // 查询并填充投入品列表
List<FarmingRecordInputDO> inputs = farmingRecordInputMapper.selectList( List<FarmingRecordInputDO> inputs = farmingRecordInputMapper.selectList(
new LambdaQueryWrapperX<FarmingRecordInputDO>() new LambdaQueryWrapperX<FarmingRecordInputDO>()