基础数据字段-农事和农资的绑定关系改成了农资去对应农事

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/agricultural/AgriculturalController.java

@@ -93,11 +93,5 @@ public class AgriculturalController {
                         BeanUtils.toBean(list, AgriculturalRespVO.class));
     }
 
-    @GetMapping("/selectList")
-    @Operation(summary = "获得农资-农事下拉框")
-    public CommonResult<List<AgriculturalRespVO>> getSpeciesList() {
-        List<AgriculturalRespVO> list = agriculturalService.getAgriculturalList();
-        return success(BeanUtils.toBean(list, AgriculturalRespVO.class));
-    }
 
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/agricultural/vo/AgriculturalPageReqVO.java

@@ -15,6 +15,9 @@ import static com.cjy.traceability.framework.common.util.date.DateUtils.FORMAT_Y
 @ToString(callSuper = true)
 public class AgriculturalPageReqVO extends PageParam {
 
+    @Schema(description = "对应农事")
+    private Integer husbandryId;
+
     @Schema(description = "所属行业", example = "1")
     private Integer sector;
 

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/agricultural/vo/AgriculturalRespVO.java

@@ -17,6 +17,9 @@ public class AgriculturalRespVO {
     @ExcelProperty("主键ID")
     private Integer id;
 
+    @Schema(description = "对应农事")
+    private Integer husbandryId;
+
     @Schema(description = "所属行业", example = "1")
     @ExcelProperty(value = "所属行业", converter = DictConvert.class)
     @DictFormat("products_industry") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/agricultural/vo/AgriculturalSaveReqVO.java

@@ -12,6 +12,9 @@ public class AgriculturalSaveReqVO {
     @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13760")
     private Integer id;
 
+    @Schema(description = "对应农事")
+    private Integer husbandryId;
+
     @Schema(description = "所属行业", example = "1")
     private Integer sector;
 

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/husbandry/HusbandryController.java

@@ -1,5 +1,6 @@
 package com.cjy.traceability.module.traceability.controller.admin.husbandry;
 
+import com.cjy.traceability.module.traceability.controller.admin.agricultural.vo.AgriculturalRespVO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,4 +93,11 @@ public class HusbandryController {
                         BeanUtils.toBean(list, HusbandryRespVO.class));
     }
 
+    @GetMapping("/selectList")
+    @Operation(summary = "获得农事-农资对应农事下拉框")
+    public CommonResult<List<HusbandryRespVO>> getHusbandryList() {
+        List<HusbandryRespVO> list = husbandryService.getHusbandrylList();
+        return success(BeanUtils.toBean(list, HusbandryRespVO.class));
+    }
+
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/husbandry/vo/HusbandryPageReqVO.java

@@ -27,7 +27,4 @@ public class HusbandryPageReqVO extends PageParam {
     @Schema(description = "是否使用农资")
     private Integer agriculturalUsed;
 
-    @Schema(description = "农资")
-    private String agricultural;
-
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/husbandry/vo/HusbandryRespVO.java

@@ -34,7 +34,4 @@ public class HusbandryRespVO {
     @ExcelProperty("是否使用农资")
     private Integer agriculturalUsed;
 
-    @Schema(description = "农资")
-    private String agricultural;
-
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/husbandry/vo/HusbandrySaveReqVO.java

@@ -24,7 +24,4 @@ public class HusbandrySaveReqVO {
     @Schema(description = "是否使用农资")
     private Integer agriculturalUsed;
 
-    @Schema(description = "农资")
-    private String agricultural;
-
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/agricultural/AgriculturalDO.java

@@ -1,5 +1,6 @@
 package com.cjy.traceability.module.traceability.dal.dataobject.agricultural;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -27,6 +28,11 @@ public class AgriculturalDO extends BaseDO {
      */
     @TableId
     private Integer id;
+    /**
+     * 对应农事
+     */
+    private Integer husbandryId;
+
     /**
      * 所属行业
      *

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/husbandry/HusbandryDO.java

@@ -47,9 +47,4 @@ public class HusbandryDO extends BaseDO {
      */
     private Integer agriculturalUsed;
 
-    /**
-     * 农资
-     */
-    private String agricultural;
-
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/agricultural/AgriculturalMapper.java

@@ -28,5 +28,4 @@ public interface AgriculturalMapper extends BaseMapperX<AgriculturalDO> {
                 .orderByDesc(AgriculturalDO::getId));
     }
 
-    List<AgriculturalRespVO> getAgriculturalList();
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/husbandry/HusbandryMapper.java

@@ -26,4 +26,5 @@ public interface HusbandryMapper extends BaseMapperX<HusbandryDO> {
                 .orderByDesc(HusbandryDO::getId));
     }
 
+    List<HusbandryRespVO> getHusbandrylList();
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/agricultural/AgriculturalService.java

@@ -52,5 +52,4 @@ public interface AgriculturalService {
      */
     PageResult<AgriculturalDO> getAgriculturalPage(AgriculturalPageReqVO pageReqVO);
 
-    List<AgriculturalRespVO> getAgriculturalList();
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/agricultural/AgriculturalServiceImpl.java

@@ -71,9 +71,4 @@ public class AgriculturalServiceImpl implements AgriculturalService {
         return agriculturalMapper.selectPage(pageReqVO);
     }
 
-    @Override
-    public List<AgriculturalRespVO> getAgriculturalList() {
-        return agriculturalMapper.getAgriculturalList();
-    }
-
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/husbandry/HusbandryService.java

@@ -52,4 +52,5 @@ public interface HusbandryService {
      */
     PageResult<HusbandryDO> getHusbandryPage(HusbandryPageReqVO pageReqVO);
 
+    List<HusbandryRespVO> getHusbandrylList();
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/husbandry/HusbandryServiceImpl.java

@@ -71,4 +71,9 @@ public class HusbandryServiceImpl implements HusbandryService {
         return husbandryMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<HusbandryRespVO> getHusbandrylList() {
+        return husbandryMapper.getHusbandrylList();
+    }
+
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/agricultural/AgriculturalMapper.xml

@@ -9,8 +9,4 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
-    <select id="getAgriculturalList"
-            resultType="com.cjy.traceability.module.traceability.controller.admin.agricultural.vo.AgriculturalRespVO">
-        select id,agricultural_name as agriculturalName from traceability_agricultural where deleted = 0 AND agricultural_status = 1
-    </select>
 </mapper>

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/husbandry/HusbandryMapper.xml

@@ -9,4 +9,8 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="getHusbandrylList"
+            resultType="com.cjy.traceability.module.traceability.controller.admin.husbandry.vo.HusbandryRespVO">
+        select id,husbandry_name as husbandryName from traceability_husbandry where deleted = 0 AND husbandry_status = 1 AND agricultural_used = 1
+    </select>
 </mapper>