fix (farm): 种植中心-农事记录
- 新增农事记录 修改bug
This commit is contained in:
@@ -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.FarmingRecordSaveReqVO;
|
||||
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.farmingrecordinput.FarmingRecordInputDO;
|
||||
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.farmingrecordinput.FarmingRecordInputMapper;
|
||||
import cn.iocoder.yudao.module.farm.dal.mysql.farmingtypemaintenance.FarmingTypeMaintenanceMapper;
|
||||
@@ -43,6 +45,8 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
|
||||
private FarmingRecordInputMapper farmingRecordInputMapper;
|
||||
@Resource
|
||||
private FarmingTypeMaintenanceMapper farmingTypeMaintenanceMapper;
|
||||
@Resource
|
||||
private FarmingNameMaintenanceMapper farmingNameMaintenanceMapper;
|
||||
|
||||
@Override
|
||||
public String createFarmingRecord(FarmingRecordSaveReqVO createReqVO) {
|
||||
@@ -133,8 +137,8 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
|
||||
// 触发任务时间和执行人集合转换,确保返回格式一致
|
||||
farmingRecord.getTaskTimeList();
|
||||
farmingRecord.getExecutorList();
|
||||
FarmingTypeMaintenanceDO farmingTypeMaintenanceDO = farmingTypeMaintenanceMapper.selectOne(FarmingTypeMaintenanceDO::getFarmingCode, farmingRecord.getTaskType());
|
||||
farmingRecord.setTaskType(farmingTypeMaintenanceDO.getFarmingName());
|
||||
FarmingNameMaintenanceDO farmingNameMaintenanceDO = farmingNameMaintenanceMapper.selectOne(FarmingNameMaintenanceDO::getFarmingCode, farmingRecord.getTaskType());
|
||||
farmingRecord.setTaskType(farmingNameMaintenanceDO.getFarmingName());
|
||||
// 查询并填充投入品列表
|
||||
List<FarmingRecordInputDO> inputs = farmingRecordInputMapper.selectList(
|
||||
new LambdaQueryWrapperX<FarmingRecordInputDO>()
|
||||
|
||||
Reference in New Issue
Block a user