From 2958b009c4d412e42e21750a10d16489272a5ad4 Mon Sep 17 00:00:00 2001 From: chenze <1824191732@qq.com> Date: Thu, 15 Aug 2024 16:24:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=88=86=E7=B1=BBid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/RepairDeviceTypeController.java | 4 ++-- .../ics/admin/service/IIcsCustomerStaffService.java | 2 +- .../ics/admin/service/IRepairRelationalService.java | 1 + .../service/impl/IcsCustomerStaffServiceImpl.java | 4 ++-- .../service/impl/RepairRelationalServiceImpl.java | 10 ++++++++++ .../com/ics/common/core/domain/IcsCustomerStaff.java | 2 ++ .../ics/controller/mobile/WxLoginAPIController.java | 6 ++++++ 7 files changed, 24 insertions(+), 5 deletions(-) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java index b6ee4e4..5e577a2 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairDeviceTypeController.java @@ -183,8 +183,8 @@ public class RepairDeviceTypeController extends BaseController { */ @RequiresPermissions("RepairDeviceType:type:view") @GetMapping("selectUserListByType") - public R selectUserListByType() { - return R.data(customerStaffService.selectUserListByType()); + public R selectUserListByType(String phone) { + return R.data(customerStaffService.selectUserListByType(phone)); } /** diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java index 512fd34..cf49719 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java @@ -90,7 +90,7 @@ public interface IIcsCustomerStaffService extends IService { IcsCustomerStaff selectUserByMobile(String phone); - List selectUserListByType(); + List selectUserListByType(String phone); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRelationalService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRelationalService.java index e79be1d..7d9e3a5 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRelationalService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IRepairRelationalService.java @@ -65,4 +65,5 @@ public interface IRepairRelationalService extends IService { List selectWorkerIdByTypeId(Long typeId); + Long selectByUserId(Long id); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java index 5f34b50..92ab164 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java @@ -300,10 +300,10 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl selectUserListByType() { + public List selectUserListByType(String phone) { QueryWrapper wrapper = new QueryWrapper<>(); - + wrapper.like(phone != null,"mobile",phone); return icsCustomerStaffMapper.selectList(wrapper); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRelationalServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRelationalServiceImpl.java index 8642554..396a34f 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRelationalServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairRelationalServiceImpl.java @@ -114,4 +114,14 @@ public class RepairRelationalServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("user_id",id); + wrapper.eq("kind",1); + RepairRelational repairRelational = repairRelationalMapper.selectOne(wrapper); + return repairRelational.getTypeId(); + } } diff --git a/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/IcsCustomerStaff.java b/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/IcsCustomerStaff.java index 3884993..bef7fcb 100644 --- a/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/IcsCustomerStaff.java +++ b/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/IcsCustomerStaff.java @@ -112,5 +112,7 @@ public class IcsCustomerStaff extends BaseEntity { @TableField(exist = false) private Integer num; + @TableField(exist = false) + private Long typeId; } diff --git a/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java b/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java index 96fc589..7fc8c6e 100644 --- a/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java +++ b/shoot-hand/ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java @@ -12,6 +12,7 @@ import com.ics.admin.domain.meeting.*; import com.ics.admin.service.ICustomerService; import com.ics.admin.service.IIcsCustomerStaffService; import com.ics.admin.service.IParkService; +import com.ics.admin.service.IRepairRelationalService; import com.ics.admin.service.meeting.*; import com.ics.common.constant.Constants; import com.ics.common.core.controller.BaseController; @@ -85,6 +86,9 @@ public class WxLoginAPIController extends BaseController { @Autowired private IStaffOpenService staffOpenService; + @Autowired + private IRepairRelationalService repairRelationalService; + String smallWxAccessTokenKey = "smallWxAccessToken"; String smallWxUserPassword = "123456"; @@ -388,6 +392,8 @@ public class WxLoginAPIController extends BaseController { IcsCustomerStaff customerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(userId); if (null != customerStaff) { + + if (customerStaff.getDataType().equals("3")) customerStaff.setTypeId(repairRelationalService.selectByUserId(customerStaff.getId())); StaffCustomer staffCustomer = new StaffCustomer(); staffCustomer.setStaffId(userId); List staffCustomers = staffCustomerService.selectStaffCustomerByStaffId(userId);