farm模块-投入品集合新增

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordSaveReqVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo;
 
+import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -65,4 +65,5 @@ public class FarmingRecordSaveReqVO {
     @Schema(description = "租户id", example = "23744")
     private String tenantId;
 
+    private List<FarmingRecordInputDO> investGoodsList;
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo;
 
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+
+import java.util.List;
 
 @Schema(description = "管理后台 - 模型管理-农事操作新增/修改 Request VO")
 @Data
@@ -46,4 +49,5 @@ public class ModelFarmingOperationSaveReqVO {
     @Schema(description = "租户id", example = "31485")
     private String tenantId;
 
+    private List<ModelFarmingOperationInputDO> investGoodsList;
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java

@@ -50,5 +50,6 @@ public class ModelFarmingOperationInputPageReqVO extends PageParam {
 
     @Schema(description = "租户id", example = "3440")
     private String tenantId;
-
+    private String assetType;
+    private String packageUnit;
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java

@@ -64,5 +64,6 @@ public class ModelFarmingOperationInputRespVO {
     @Schema(description = "租户id", example = "3440")
     @ExcelProperty("租户id")
     private String tenantId;
-
+    private String assetType;
+    private String packageUnit;
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java

@@ -44,5 +44,6 @@ public class ModelFarmingOperationInputSaveReqVO {
 
     @Schema(description = "租户id", example = "3440")
     private String tenantId;
-
+    private String assetType;
+    private String packageUnit;
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecord/FarmingRecordDO.java

@@ -1,14 +1,13 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO;
+import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.List;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil;
 
 /**
  * 种植中心-农事基地-农事记录 DO
@@ -100,6 +99,8 @@ public class FarmingRecordDO extends BaseDO {
     private String plotName;
 
     private String tenantId;
+    @TableField(exist = false)
+    private List<FarmingRecordInputDO> investGoodsList;
 
     /**
      * 获取执行反馈图片URL集合

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/farmingrecordinput/FarmingRecordInputDO.java

@@ -1,13 +1,10 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
 import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 种植中心-农事基地-农事记录-投入品 DO

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperation/ModelFarmingOperationDO.java

@@ -1,9 +1,12 @@
 package cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation;
 
+import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
 import lombok.*;
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
@@ -73,4 +76,6 @@ public class ModelFarmingOperationDO extends BaseDO {
     private String plotName;
 
     private String tenantId;
+
+    private List<ModelFarmingOperationInputDO> investGoodsList;
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java

@@ -71,4 +71,8 @@ public class ModelFarmingOperationInputDO extends BaseDO {
     private String plotName;
 
     private String tenantId;
+
+
+    private String assetType;
+    private String packageUnit;
 }

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

@@ -8,7 +8,7 @@ import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRec
 import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO;
 import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecord.FarmingRecordMapper;
-import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil;
+import cn.iocoder.yudao.module.farm.dal.mysql.farmingrecordinput.FarmingRecordInputMapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -30,6 +30,8 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
 
     @Resource
     private FarmingRecordMapper farmingRecordMapper;
+    @Resource
+    private FarmingRecordInputMapper farmingRecordInputMapper;
 
     @Override
     public String createFarmingRecord(FarmingRecordSaveReqVO createReqVO) {
@@ -41,9 +43,14 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
 
         // 处理图片集合转换
         handleImageConversion(farmingRecord, createReqVO);
+        //投入品集合单条保存
+        createReqVO.getInvestGoodsList().forEach(e -> {
+            e.setId(IdUtil.fastUUID());
+            e.setFarmRecordId(farmingRecord.getId());
+            farmingRecordInputMapper.insert(e);
+        });
 
         farmingRecordMapper.insert(farmingRecord);
-
         // 返回
         return farmingRecord.getId();
     }
@@ -75,7 +82,7 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
         farmingRecordMapper.deleteByIds(ids);
     }
 
-private void validateFarmingRecordExists(String id) {
+    private void validateFarmingRecordExists(String id) {
         if (farmingRecordMapper.selectById(id) == null) {
             throw exception(FARMING_RECORD_NOT_EXISTS);
         }