地块id添加

zengh

2022-07-12 3efd7f01cba4aaa09f75662e287bfa4c780990cf

地块id添加

 src/main/java/org/springblade/modules/farmplant/entity/FarmProductStock.java

@@ -87,5 +87,9 @@
     * 租户id
     */
    private String tenantId;
    /**
     * 地块id
     */
    private String landId;

}

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

@@ -30,7 +30,7 @@
    </select>

    <select id="selectFarmProductStockPages" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
        select sfps.strain_id strainId,sum(sfps.weight) weight,ss.url,ss.strain_name strainName from
        select sfps.strain_id strainId,sfps.land_id,sum(sfps.weight) weight,ss.url,ss.strain_name strainName from
        sys_farm_product_stock sfps
        left join sys_strain ss on ss.id = sfps.strain_id
        where 1=1
@@ -52,7 +52,7 @@
        <if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
            and sfps.tenant_id = #{farmProductStock.tenantId}
        </if>
        group by sfps.strain_id,ss.url,ss.strain_name
        group by sfps.strain_id,ss.url,ss.strain_name,sfps.land_id
    </select>



 src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java

@@ -144,6 +144,7 @@
                productStock.setFarmPlantId(recovery.getFarmPlantId());
                productStock.setTenantId(recovery.getTenantId());
                productStock.setDeptId(recovery.getDeptId());
                productStock.setLandId(recovery.getLandId());
                //新增操作
                farmProductStockService.save(productStock);
            }

 src/main/java/org/springblade/modules/recovery/entity/Recovery.java

@@ -92,4 +92,5 @@
     * 租户id
     */
    private String tenantId;

}

 src/main/java/org/springblade/modules/sale/entity/Sale.java

@@ -84,5 +84,9 @@
     * 品牌
     */
    private String saleBrand;
    /**
     * 地块id
     */
    private String landId;

}

 src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml

@@ -22,6 +22,7 @@
        <result column="strain_name" property="strainName"/>
        <result column="url" property="url"/>
        <result column="district" property="district"/>
        <result column="land_id" property="landId"/>
    </resultMap>



 src/main/java/org/springblade/modules/sale/vo/SaleVO.java

@@ -47,4 +47,16 @@
     * 销售地中文
     */
    private String district;
    /**
     * 地块名称
     */
    private String landName;
    /**
     * 地块面积
     */
    private String landArea;
    /**
     * 种养时间
     */
    private String transplanTime;
}