Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

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

@@ -33,6 +33,51 @@
        group by sfps.id,sfps.strain_id,ss.url,ss.strain_name,sfps.land_id
    </select>

    <select id="selectFarmProductStockPageCount" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
        SELECT a.strainId,SUM(weight) weight,a.url,a.strainName FROM
            (SELECT
                 sfps.id,
                 sfps.strain_id AS strainId,
                 sfps.land_id,
                 sum( sfps.weight ) AS weight,
                 ss.url,
                 ss.strain_name AS strainName
             FROM
                 sys_farm_product_stock sfps
                     LEFT JOIN sys_strain ss ON ss.id = sfps.strain_id
                     LEFT JOIN sys_land sl ON sl.id = sfps.land_id
             WHERE
                 1 = 1
        <if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
            and sfps.strain_id = #{farmProductStock.strainId}
        </if>
        <if test="farmProductStock.leaves!=null and farmProductStock.leaves!=''">
            and sfps.leaves = #{farmProductStock.leaves}
        </if>
        <if test="farmProductStock.startTime!=null and farmProductStock.startTime!=''">
            and sfps.time &gt;= #{farmProductStock.startTime}
        </if>
        <if test="farmProductStock.endTime!=null and farmProductStock.endTime!=''">
            and sfps.time &lt;= #{farmProductStock.endTime}
        </if>
        <if test="farmProductStock.deptId!=null and farmProductStock.deptId!=''">
            and sfps.dept_id = #{farmProductStock.deptId}
        </if>
        <if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
            and sfps.tenant_id = #{farmProductStock.tenantId}
        </if>
        <if test="farmProductStock.farmId!=null and farmProductStock.farmId!=''">
            and sl.farm_id = #{farmProductStock.farmId}
        </if>
             GROUP BY
                 sfps.id,
                 sfps.strain_id,
                 ss.url,
                 ss.strain_name,
                 sfps.land_id
            ) a GROUP BY strainId
    </select>

    <select id="selectFarmProductStockPages" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
        select sfps.strain_id strainId,sfps.land_id,sum(sfps.weight) weight,ss.url,ss.strain_name strainName from
        sys_farm_product_stock sfps