新增查询条件strainType和strainType

guoshilong

2022-07-26 4f6f313d842301106ac9dc79bf39d5ba5f571899

新增查询条件strainType和strainType

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

@@ -357,6 +357,9 @@
        <if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
            and sfps.tenant_id = #{farmProductStock.tenantId}
        </if>
        <if test="farmProductStock.strainType !=null and farmProductStock.strainType !='' ">
            and ss.strain_type = #{farmProductStock.strainType}
        </if>
    </select>

    <!--销售对比库存是否充足-->

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

@@ -38,4 +38,9 @@
     */
    private String farmId;

    /**
     * 品种类型(0种植 1水产 2畜牧)
     */
    private String strainType;

}

 src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml

@@ -152,8 +152,11 @@
        stf.agricultural_name,
        stf.factory_name
        FROM sys_stockrecord st
        LEFT JOIN (SELECT id, agricultural_name, factory_name FROM sys_stockfactory) stf
        LEFT JOIN (SELECT id, agricultural_name, factory_name,type FROM sys_stockfactory) stf
        ON st.stock_id1 = stf.id
        <if test="stock.stockType !=null and stock.stockType != '' ">
            WHERE stf.type =#{stock.stockType}
        </if>
        GROUP BY stf.id,
        stf.agricultural_name,
        stf.factory_name

 src/main/java/org/springblade/modules/stock/vo/StocksVO.java

@@ -56,5 +56,8 @@
     * 总的出库数量
     */
    Double zcknum;

    /**
     * 农资类型分类（0：化肥 1：有机肥 2：杀虫剂 等）
     */
    String stockType;
}