运营收益优化

rain

2026-01-30 2a5fa4217e35649e8e01e5f5c14843233a00d5b4

运营收益优化

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdOperationalRevenueController.java

@@ -41,10 +41,11 @@
        @ApiParam("净利润") @RequestParam(value = "netProfit", required = false) String netProfit,
        @ApiParam("财务内部收益率") @RequestParam(value = "financialIrr", required = false) String financialIrr,
        @ApiParam("市场空间") @RequestParam(value = "marketSpace", required = false) String marketSpace,
        @ApiParam("收益预测") @RequestParam(value = "earnForecast", required = false) String earnForecast,
        @ApiParam("创建人") @RequestParam(value = "nickName", required = false) String nickName
    ) {
        Page<GdOperationalRevenue> page = new Page<>(current, size);
        IPage<GdOperationalRevenue> result = operationalRevenueService.selectPage(page, operatingIncome, totalCost, netProfit, financialIrr, marketSpace, nickName);
        IPage<GdOperationalRevenue> result = operationalRevenueService.selectPage(page, operatingIncome, totalCost, netProfit, financialIrr, marketSpace, earnForecast, nickName);

        // 转换为Vo分页
        IPage<GdOperationalRevenueVo> voPage = result.convert(operationalRevenueService::convertToVo);

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdOperationalRevenue.java

@@ -93,7 +93,7 @@
    @TableField("nick_name")
    private String nickName;

    @TableField(exist = false)
    @TableField("earn_forecast")
    private String earnForecast;

    /**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/GdOperationalRevenueService.java

@@ -19,10 +19,11 @@
     * @param netProfit 净利润
     * @param financialIrr 财务内部收益率
     * @param marketSpace 市场空间
     * @param earnForecast 收益预测
     * @param nickName 创建人
     * @return 分页结果
     */
    IPage<GdOperationalRevenue> selectPage(Page<GdOperationalRevenue> page, String operatingIncome, String totalCost, String netProfit, String financialIrr, String marketSpace, String nickName);
    IPage<GdOperationalRevenue> selectPage(Page<GdOperationalRevenue> page, String operatingIncome, String totalCost, String netProfit, String financialIrr, String marketSpace, String earnForecast, String nickName);

    /**
     * 实体类转换Vo

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java

@@ -24,7 +24,7 @@
    implements GdOperationalRevenueService {

    @Override
    public IPage<GdOperationalRevenue> selectPage(Page<GdOperationalRevenue> page, String operatingIncome, String totalCost, String netProfit, String financialIrr, String marketSpace, String nickName) {
    public IPage<GdOperationalRevenue> selectPage(Page<GdOperationalRevenue> page, String operatingIncome, String totalCost, String netProfit, String financialIrr, String marketSpace, String earnForecast, String nickName) {
        LambdaQueryWrapper<GdOperationalRevenue> queryWrapper = new LambdaQueryWrapper<>();

        // 根据营业收入查询 (转换为精确查询)
@@ -68,6 +68,11 @@
            queryWrapper.like(GdOperationalRevenue::getMarketSpace, marketSpace);
        }

        // 根据收益预测模糊查询
        if (StringUtils.hasText(earnForecast)) {
            queryWrapper.like(GdOperationalRevenue::getEarnForecast, earnForecast);
        }

        // 根据创建人名称模糊查询
        if (StringUtils.hasText(nickName)) {
            queryWrapper.like(GdOperationalRevenue::getNickName, nickName);