智慧农业后台管理
tangzy
2022-07-14 7abdd3ba7fa34c059f3c867e366d1a2137ae702f
kuc管理
2 files modified
8 ■■■■ changed files
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/stock/controller/StockController.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -95,6 +95,9 @@
        <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
            and sfp.tenant_id = #{farmPlant.tenantId}
        </if>
        <if test="farmPlant.status!=null and farmPlant.status!=''">
            and sfp.status = #{farmPlant.status}
        </if>
        group by sfp.strain_id,strain_name,land_unit
    </select>
@@ -301,6 +304,9 @@
        <if test="farmPlant.deptId!=null and farmPlant.deptId!=''">
            and sfp.dept_id = #{farmPlant.deptId}
        </if>
        <if test="farmPlant.status!=null and farmPlant.status!=''">
            and sfp.status = #{farmPlant.status}
        </if>
        <if test="farmPlant.tenantId!=null and farmPlant.tenantId!=''">
            and sfp.tenant_id = #{farmPlant.tenantId}
        </if>
src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -495,7 +495,7 @@
     * @param query
     * @return
     */
    @PostMapping("/pagenums")
    @GetMapping("/pagenums")
    public R pagenums(StocksVO stock, Query query) {
        Double rknu = 0.0;
        Double cknu = 0.0;