增加查询地块时有农场时的条件查询

guoshilong

2022-08-04 6007a2c08ef543bbc004b586cac544c3eb725ea0

增加查询地块时有农场时的条件查询

 src/main/java/org/springblade/modules/lang/controller/LandController.java

@@ -111,8 +111,8 @@
     * 根据品种id查询对应地块
     */
    @GetMapping("/selcetByStrainId")
    public R selcetByStrainId(String strainId) {
        List<Land> list = landService.selectByStrainId(strainId);
    public R selcetByStrainId(String strainId,String farmId) {
        List<Land> list = landService.selectByStrainId(strainId,farmId);
        return R.data(list);
    }


 src/main/java/org/springblade/modules/lang/mapper/LandMapper.java

@@ -94,5 +94,5 @@
     * @param strainId 品种id
     * @return
     */
    List<Land> selectByStrainId(String strainId);
    List<Land> selectByStrainId(@Param("strainId") String strainId,@Param("farmId") String farmId);
}

 src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml

@@ -220,10 +220,13 @@
    </select>

    <select id="selectByStrainId" resultType="org.springblade.modules.lang.entity.Land">
        SELECT land.id,land.land_name
        SELECT land.id,land.land_name,land.url,land.farm_id
        FROM sys_land land
            LEFT JOIN sys_farm_product_stock fps ON fps.land_id = land.id
        WHERE fps.strain_id = #{strainId}
        <if test="farmId !=null and farmId != '' ">
            AND land.farm_id = #{farmId}
        </if>
    </select>

</mapper>

 src/main/java/org/springblade/modules/lang/service/ILandService.java

@@ -96,7 +96,8 @@
    /**
     * 根据品种id查询地块
     * @param strainId 品种id
     * @param farmId 农场id
     * @return
     */
    List<Land> selectByStrainId(String strainId);
    List<Land> selectByStrainId(String strainId,String farmId);
}

 src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java

@@ -120,7 +120,7 @@
    }

    @Override
    public List<Land> selectByStrainId(String strainId) {
        return baseMapper.selectByStrainId(strainId);
    public List<Land> selectByStrainId(String strainId,String farmId) {
        return baseMapper.selectByStrainId(strainId,farmId);
    }
}