8.10

luodangjia

2024-08-09 adeef693ffeb030db6e1dbad186d55171da5fa39

8.10

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java

@@ -175,5 +175,14 @@
    @ApiModelProperty("是否为再投单")
    @TableField("is_reinvest")
    private Integer isReinvest;
    @ApiModelProperty("铭牌图片(多张照片 ','隔开)")
    @TableField("card_pic")
    private String cardPic;
    @ApiModelProperty("机型图片(多张照片 ','隔开)")
    @TableField("machine_pic")
    private String machinePic;
    @ApiModelProperty("回收单凭证(多张照片 ','隔开)")
    @TableField("paper_pic")
    private String paperPic;

}

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java

@@ -334,8 +334,11 @@
            @ApiImplicitParam(value = "改派原因", name = "applyReason", dataType = "String")
    })
    @Transactional(rollbackFor = Exception.class)
    public R<String> reassignment(@RequestParam Integer type, @RequestParam String orderId,
    public R<String> reassignment(@RequestParam Integer type, @RequestParam String orderIds,
                                  @RequestParam Integer workerId, String applyReason) {
        String[] split = orderIds.split(",");
        for (String orderId : split) {

        MasterWorker masterWorker = masterWorkerService.lambdaQuery()
                .eq(MasterWorker::getId, workerId)
                .eq(MasterWorker::getIsDelete, 0).one();
@@ -377,7 +380,9 @@
//        } catch (IOException e) {
//            return R.fail("订单推送失败！");
//        }
        return result ? R.ok() : R.fail();
        }

        return R.ok() ;
    }

    /**

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java

@@ -175,4 +175,6 @@
    @TableField("fake")
    private Integer fake;



}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -100,12 +100,10 @@
            orderNumber = list.stream().filter(order -> order.getNumber() != null)
                    .mapToInt(OrderQueryVO::getNumber).sum();
            fakeNumber = list.stream().filter(order -> order.getFakeCount() != null)
                    .mapToInt(OrderQueryVO::getNumber).sum();
                    .mapToInt(OrderQueryVO::getFakeCount).sum();

        }
        return new

                OrderResultVO(totalMoney, orderNumber, list,fakeNumber);
        return new OrderResultVO(totalMoney, orderNumber, list,fakeNumber);

    }