From f131c141bafa2a060050fa85799fb9d1eb617b69 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 09 九月 2025 18:05:00 +0800 Subject: [PATCH] 小程序接口 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java | 41 +++++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java index 5ce84ee..4a5c4b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.api; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; @@ -9,10 +10,7 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.dto.TCrmClinicAuditDTO; import com.ruoyi.system.dto.TCrmClinicDTO; -import com.ruoyi.system.model.TCrmBranch; -import com.ruoyi.system.model.TCrmClinic; -import com.ruoyi.system.model.TCrmSalesperson; -import com.ruoyi.system.model.TCrmWarehouse; +import com.ruoyi.system.model.*; import com.ruoyi.system.query.TCrmClinicQuery; import com.ruoyi.system.service.*; import com.ruoyi.system.vo.TCrmClinicVO; @@ -20,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -46,14 +45,16 @@ private final TCrmWarehouseService crmWarehouseService; private final TCrmSalespersonService crmSalespersonService; private final ISysUserService sysUserService; + private final TCrmDeviceService crmDeviceService; @Autowired - public TCrmClinicController(TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TCrmBranchService crmBranchService, TCrmWarehouseService crmWarehouseService, TCrmSalespersonService crmSalespersonService, ISysUserService sysUserService) { + public TCrmClinicController(TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TCrmBranchService crmBranchService, TCrmWarehouseService crmWarehouseService, TCrmSalespersonService crmSalespersonService, ISysUserService sysUserService, TCrmDeviceService crmDeviceService) { this.crmClinicService = crmClinicService; this.crmSupplierService = crmSupplierService; this.crmBranchService = crmBranchService; this.crmWarehouseService = crmWarehouseService; this.crmSalespersonService = crmSalespersonService; this.sysUserService = sysUserService; + this.crmDeviceService = crmDeviceService; } /** @@ -68,12 +69,32 @@ /** * 获取crm诊所管理管理列表 */ - @ApiOperation(value = "获取crm诊所管理列表") + @ApiOperation(value = "获取crm诊所管理审核分页列表") + @PostMapping(value = "/pageAuditList") + public R<PageInfo<TCrmClinicVO>> pageAuditList(@RequestBody TCrmClinicQuery query) { + return R.ok(crmClinicService.pageAuditList(query)); + } + + /** + * 获取crm诊所管理管理列表 + */ + @ApiOperation(value = "获取crm诊所管理列表",notes = "type 1=设备使用 2=其他") @PostMapping(value = "/list") - public R<List<TCrmClinic>> list() { - return R.ok(crmClinicService.list(Wrappers.lambdaQuery(TCrmClinic.class) - .eq(TCrmClinic::getStatus,1) - .orderByDesc(TCrmClinic::getCreateTime))); + public R<List<TCrmClinic>> list(@RequestParam(value = "type") Integer type) { + if(type == 1){ + List<TCrmDevice> list = crmDeviceService.list(); + LambdaQueryWrapper<TCrmClinic> wrapper = new LambdaQueryWrapper<>(); + if(!CollectionUtils.isEmpty(list)){ + List<String> clinicIds = list.stream().map(TCrmDevice::getClinicId).collect(Collectors.toList()); + wrapper.notIn(TCrmClinic::getId,clinicIds); + } + wrapper.eq(TCrmClinic::getStatus,3).orderByDesc(TCrmClinic::getCreateTime); + return R.ok(crmClinicService.list(wrapper)); + }else { + return R.ok(crmClinicService.list(Wrappers.lambdaQuery(TCrmClinic.class) + .eq(TCrmClinic::getStatus,3) + .orderByDesc(TCrmClinic::getCreateTime))); + } } /** -- Gitblit v1.7.1