农事操作查询修改，采收查询修改

Administrator

2022-05-19 84b2e543d0acffa9afede334e65ae9b5bde1888c

农事操作查询修改，采收查询修改

 src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml

@@ -4,7 +4,7 @@

    <!--自定义查询农场养殖记录分页数据-->
    <select id="selectFarmPlantPage" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
        select sfp.*,ss.strain_name strainName,url,sl.land_name landName from sys_farm_plant sfp
        select sfp.*,ss.strain_name strainName,url,sl.land_name landName,sl.land_area area,land_unit landUnit from sys_farm_plant sfp
        left join sys_strain ss on ss.id = sfp.strain_id
        left join sys_land sl on sl.id = sfp.land_id
        where 1=1

 src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml

@@ -5,5 +5,12 @@
    <!--自定义查询农产品库存分页数据-->
    <select id="selectFarmProductStockPage" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
        select * from sys_farm_product_stock
        where 1=1
        <if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
            and strain_id = #{farmProductStock.strainId}
        </if>
        <if test="farmProductStock.leaves!=null and farmProductStock.leaves!=''">
            and leaves = #{farmProductStock.leaves}
        </if>
    </select>
</mapper>

 src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java

@@ -7,6 +7,8 @@
import org.springblade.modules.farmplant.vo.FarmPlantVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * 农场养殖记录表服务实现类
 * @since 2022-05-12
@@ -24,6 +26,19 @@
     */
    @Override
    public IPage<FarmPlantVO> selectFarmPlantPage(IPage<FarmPlantVO> page, FarmPlantVO farm) {
        return page.setRecords(baseMapper.selectFarmPlantPage(page, farm));
        List<FarmPlantVO> farmPlantVOS = baseMapper.selectFarmPlantPage(page, farm);
        //遍历
        farmPlantVOS.forEach(farmPlantVO -> {
            if (farmPlantVO.getLandUnit().equals("0")){
                farmPlantVO.setArea(farmPlantVO.getArea()+"亩");
            }
            if (farmPlantVO.getLandUnit().equals("1")){
                farmPlantVO.setArea(farmPlantVO.getArea()+"分");
            }
            if (farmPlantVO.getLandUnit().equals("2")){
                farmPlantVO.setArea(farmPlantVO.getArea()+"平方米");
            }
        });
        return page.setRecords(farmPlantVOS);
    }
}

 src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java

@@ -27,4 +27,14 @@
     */
    private String landName;

    /**
     * 土地面积
     */
    private String area;

    /**
     * 面积单位(0: 亩 1:分 2：平方米)
     */
    private String landUnit;

}

 src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml

@@ -4,9 +4,15 @@

    <!--自定义查询采收记录分页数据-->
    <select id="selectRecoveryPage" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
        select sfr.*,sl.land_name landName from sys_recovery sr
        select sr.*,sl.land_name landName from sys_recovery sr
        left join sys_land sl on sl.id = sr.land_id
        where 1=1
        <if test="recovery.strainId!=null and recovery.strainId!=''">
            and sr.strain_id = #{recovery.strainId}
        </if>
        <if test="recovery.leaves!=null and recovery.leaves!=''">
            and sr.leaves = #{recovery.leaves}
        </if>
        <if test="recovery.landId!=null and recovery.landId!=''">
            and sr.land_id = #{recovery.landId}
        </if>