添加农资使用记录

xiebin

2022-08-01 d16174bd73148a2963f495a24ef97a40e62b4169

添加农资使用记录

 src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java

@@ -92,6 +92,14 @@
        return R.data(pages);
    }

    @GetMapping("/pageNz")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入farm")
    public R<IPage<FarmingRecordVO>> pageNz(FarmingRecordVO farm, Query query) {
        IPage<FarmingRecordVO> pages = farmService.selectFarmingRecordPageByNz(Condition.getPage(query), farm);
        return R.data(pages);
    }

    /**
     * 查询农事操作记录（不分页）
     * @param farm

 src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.java

@@ -41,6 +41,7 @@
     * @return
     */
    List<FarmingRecordVO> selectFarmingRecordPage(@Param("page") IPage page,@Param("farmingRecord") FarmingRecordVO farm);
    List<FarmingRecordVO> selectFarmingRecordPageByNz(@Param("page") IPage page,@Param("farmingRecord") FarmingRecordVO farm);
    List<FarmingRecordVO> selectFarmingRecordPages(@Param("farmingRecord") FarmingRecordVO farm);

    /**

 src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml

@@ -45,6 +45,51 @@
        </if>
    </select>

    <!--自定义查询农事记录分页数据-->
    <select id="selectFarmingRecordPageByNz" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
        SELECT
        sfr.*,
        sl.land_name landName,
        user.real_name,
        strain.strain_name,
        sf.factory_name
        FROM
        sys_farming_record sfr
        LEFT JOIN sys_land sl ON sl.id = sfr.land_id
        LEFT JOIN blade_user user on sfr.operator = user.id
        LEFT JOIN sys_strain strain on sfr.strain_id = strain.id
        LEFT JOIN sys_stockfactory sf on sf.id = sfr.stock_id
        WHERE
        1 =1 AND sfr.stock_id IS NOT NULL
        <if test="farmingRecord.landId!=null and farmingRecord.landId!=''">
            and sfr.land_id = #{farmingRecord.landId}
        </if>
        <if test="farmingRecord.type!=null and farmingRecord.type!=''">
            and sfr.type = #{farmingRecord.type}
        </if>
        <if test="farmingRecord.stockId!=null and farmingRecord.stockId!=''">
            and sfr.stock_id = #{farmingRecord.stockId}
        </if>
        <if test="farmingRecord.jobWay!=null and farmingRecord.jobWay!=''">
            and sfr.job_way = #{farmingRecord.jobWay}
        </if>
        <if test="farmingRecord.operator!=null and farmingRecord.operator!=''">
            and sfr.operator = #{farmingRecord.operator}
        </if>
        <if test="farmingRecord.deptId!=null and farmingRecord.deptId!=''">
            and sfr.dept_id = #{farmingRecord.deptId}
        </if>
        <if test="farmingRecord.tenantId!=null and farmingRecord.tenantId!=''">
            and sfr.tenant_id = #{farmingRecord.tenantId}
        </if>
        <if test="farmingRecord.strainId!=null and farmingRecord.strainId!=''">
            and sfr.strain_id = #{farmingRecord.strainId}
        </if>
        <if test="farmingRecord.farmId!=null and farmingRecord.farmId!=''">
            and sl.farm_id = #{farmingRecord.farmId}
        </if>
    </select>

    <select id="selectFarmingRecordPages" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
        select sfr.*,sl.land_name landName from sys_farming_record sfr
        left join sys_land sl on sl.id = sfr.land_id

 src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java

@@ -26,6 +26,7 @@
     * @return
     */
    IPage<FarmingRecordVO> selectFarmingRecordPage(IPage<FarmingRecordVO> page, FarmingRecordVO farm);
    IPage<FarmingRecordVO> selectFarmingRecordPageByNz(IPage<FarmingRecordVO> page, FarmingRecordVO farm);
    List<FarmingRecordVO> selectFarmingRecordPages(FarmingRecordVO farm);
    /**
     * 查询统计本年农事记录操作总数

 src/main/java/org/springblade/modules/farm/service/impl/FarmRecordServiceImpl.java

@@ -48,6 +48,22 @@
    }

    @Override
    public IPage<FarmingRecordVO> selectFarmingRecordPageByNz(IPage<FarmingRecordVO> page, FarmingRecordVO farm) {
        List<FarmingRecordVO> recordVOS = baseMapper.selectFarmingRecordPageByNz(page, farm);
        recordVOS.forEach(recordVO->{
            //查询字典对应的名称
            DictBiz dictBiz = new DictBiz();
            dictBiz.setTenantId(farm.getTenantId());
            dictBiz.setCode("farmingType");
            dictBiz.setDictKey(recordVO.getType());
            DictBiz one = dictBizService.getOne(new QueryWrapper<>(dictBiz));
            //设置名称
            recordVO.setTypeName(one.getDictValue());
        });
        return page.setRecords(recordVOS);
    }

    @Override
    public List<FarmingRecordVO> selectFarmingRecordPages(FarmingRecordVO farm) {
        List<FarmingRecordVO> farmingRecordVOS = baseMapper.selectFarmingRecordPages(farm);
        farmingRecordVOS.forEach(recordVO->{

 src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java

@@ -46,4 +46,8 @@
     * 肥料名称
     */
    private String agriculturalName;
    /**
     * 农资公司名称
     */
    private String factoryName;
}