智慧农业后台管理
guoshilong
2022-08-10 fe83afa153234db5a41445e05e26c30df2f93608
农事详情记录查询
6 files modified
43 ■■■■■ changed files
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml 20 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
@@ -71,6 +71,16 @@
    }
    /**
     * 获取农事记录详情带中文
     * @param farmingRecordVO
     * @return
     */
    @GetMapping("/details")
    public R details(FarmingRecordVO farmingRecordVO){
        return R.data(farmService.getDetails(farmingRecordVO));
    }
    /**
     * 分页
     */
    @GetMapping("/list")
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java
@@ -75,4 +75,6 @@
     * @return
     */
    List<FarmingRecordVO> getFarmingRecordListfarm(@Param("farm") FarmingRecordVO farm);
    FarmingRecordVO getDetails(@Param("FarmingRecordVO") FarmingRecordVO farmingRecordVO);
}
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -262,4 +262,24 @@
        </if>
        order by sfr.time desc,sfr.create_time desc
    </select>
    <select id="getDetails" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
        SELECT sfr.*,land.land_name,
               bdb.dict_value AS typeName,
               strain.strain_name AS strainName,
                stock.agriculturalType,
               stock.agricultural_name,
               bu.name AS realName
        FROM sys_farming_record sfr
        LEFT JOIN sys_land land ON land.id = sfr.land_id
        LEFT JOIN blade_dict_biz bdb ON bdb.dict_key = sfr.type
        LEFT JOIN sys_strain strain ON strain.id = sfr.strain_id
        LEFT JOIN (
            SELECT stf.id,stf.agricultural_name,bdb1.dict_value AS agriculturalType
            FROM sys_stockfactory stf
            LEFT JOIN blade_dict_biz bdb1 ON stf.type = bdb1.dict_key
            WHERE bdb1.code = "stockType" GROUP BY stf.id,stf.agricultural_name,bdb1.dict_value
            ) stock ON sfr.stock_id = stock.id
        LEFT JOIN blade_user bu ON bu.id = sfr.operator
        WHERE bdb.code = "farmingType" AND sfr.id = #{FarmingRecordVO.id}
    </select>
</mapper>
src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
@@ -59,4 +59,6 @@
     * @return
     */
    List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm);
    FarmingRecordVO getDetails(FarmingRecordVO farmingRecordVO);
}
src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java
@@ -132,4 +132,9 @@
    public List<FarmingRecordVO> getFarmingRecordListfarm(FarmingRecordVO farm) {
        return baseMapper.getFarmingRecordListfarm(farm);
    }
    @Override
    public FarmingRecordVO getDetails(FarmingRecordVO farmingRecordVO) {
        return baseMapper.getDetails(farmingRecordVO);
    }
}
src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
@@ -47,6 +47,10 @@
     */
    private String agriculturalName;
    /**
     * 肥料类型
     */
    private String agriculturalType;
    /**
     * 农资公司名称
     */
    private String factoryName;