首页种养品种总和保留三位小数，详情接口和种养品种接口分离

guoshilong

2022-08-03 fc6f694cbc5c8d4f98bb98c51b87b4d73ac98885

首页种养品种总和保留三位小数，详情接口和种养品种接口分离

 src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java

@@ -102,12 +102,23 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入farmPlant")
    public R<IPage<FarmPlantVO>> page(FarmPlantVO farmPlant, Query query) {
//        IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
        IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
        return R.data(pages);
    }

    /**
     *首页当前种养产品总和
     */
    @GetMapping("/strainCount")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入farmPlant")
    public R<IPage<FarmPlantVO>> strainCount(FarmPlantVO farmPlant, Query query) {
        IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPageCount(Condition.getPage(query), farmPlant);
        return R.data(pages);
    }



    /**
     * 查询种养记录列表（不分页）
     * @param farmPlant

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

@@ -55,9 +55,8 @@
    </select>

    <select id="selectFarmPlantPageCount" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
--         sfp.*,ss.strain_name strainName,ss.url,sl.land_name landName,sl.land_area area,land_unit landUnit
        SELECT
            a.strain_id,a.strainName,SUM(a.land_area) area,a.url,a.tenant_id,a.dept_id
            a.strain_id,a.strainName,SUM(FORMAT(a.land_area,3)) area,a.url,a.tenant_id,a.dept_id
        FROM
            (
                SELECT
@@ -66,7 +65,7 @@
                    ss.url,
                    sl.land_name AS landName,
                    land_unit AS landUnit,
                    ( CASE WHEN land_unit = 2 THEN sl.land_area * 0.0015 WHEN land_unit = 1 THEN sl.land_area * 0.1 ELSE sl.land_area END ) land_area
                    ( CASE WHEN land_unit = 2 THEN FORMAT(sl.land_area * 0.0015,3) WHEN land_unit = 1 THEN sl.land_area * 0.1 ELSE sl.land_area END ) land_area
                FROM
                    sys_farm_plant sfp
                        LEFT JOIN sys_strain ss ON ss.id = sfp.strain_id