bug修改

xuhy

2025-10-27 f70a07432bdcd922c3a1dfa59e80b7e9edd6e5cd

bug修改

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java

@@ -108,6 +108,9 @@
                    .last("LIMIT 1"));
            query.setSalespersonId(crmSalesperson.getId());
        }
        if (roleType == 1){
            query.setRoleType(roleType);
        }
        return R.ok(crmClinicService.pageList(query));
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java

@@ -100,6 +100,13 @@
                    .last("LIMIT 1"));
            wrapper.eq(TCrmSalesperson::getBranchId,crmBranch.getId());
        }
        if(roleType == 3){
            // 查询业务员信息
            TCrmSalesperson crmSalesperson = crmSalespersonService.getOne(Wrappers.lambdaQuery(TCrmSalesperson.class)
                    .eq(TCrmSalesperson::getUserId, userId)
                    .last("LIMIT 1"));
            wrapper.eq(TCrmSalesperson::getId,crmSalesperson.getId());
        }
        wrapper.eq(TCrmSalesperson::getStatus,1)
                .orderByDesc(TCrmSalesperson::getCreateTime);
        return R.ok(crmSalespersonService.list(wrapper));

 ruoyi-system/src/main/java/com/ruoyi/system/export/ProcurementReportSupplierExport.java

@@ -25,9 +25,9 @@
    private String payTimeStr;
    @Excel(name = "采购金额", width = 20)
    private BigDecimal payMoney;
    @Excel(name = "供应商获得金额", width = 20)
    private BigDecimal money;
    @Excel(name = "平台分佣金额", width = 20)
    private BigDecimal money;
    @Excel(name = "供应商获得金额", width = 20)
    private BigDecimal supplierMoney;
    @Excel(name = "状态", width = 20,replace = {"草稿_1","待支付_2","待发货_3","已发货_4","已入库_5","已取消_6"})
    private Integer status;