From 5aeb72a728f9937b86214a0048dfadf93e9e52e0 Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 16 Dec 2024 20:17:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=BF=87=E4=BF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/config/ScheduledService.java | 2 +- .../modules/business/pojo/entity/Device.java | 5 ++ .../service/impl/DeviceServiceImpl.java | 1 + .../impl/MaintenancePlanServiceImpl.java | 25 ++++-- .../system/controller/UserController.java | 11 +++ .../modules/system/mapper/DeptMapper.xml | 3 +- .../modules/system/mapper/UserMapper.java | 5 ++ .../modules/system/mapper/UserMapper.xml | 22 ++++++ .../modules/system/pojo/entity/User.java | 2 +- .../modules/system/pojo/vo/LimsUserVO.java | 76 +++++++++++++++++++ .../modules/system/service/IUserService.java | 6 ++ .../system/service/impl/UserServiceImpl.java | 7 ++ 12 files changed, 157 insertions(+), 8 deletions(-) create mode 100644 src/main/java/org/springblade/modules/system/pojo/vo/LimsUserVO.java diff --git a/src/main/java/org/springblade/modules/business/config/ScheduledService.java b/src/main/java/org/springblade/modules/business/config/ScheduledService.java index c1965ec..0d4e16f 100644 --- a/src/main/java/org/springblade/modules/business/config/ScheduledService.java +++ b/src/main/java/org/springblade/modules/business/config/ScheduledService.java @@ -20,7 +20,7 @@ public class ScheduledService { */ @Scheduled(cron = "0 25 14 * * ? ") private void toVideoTransformation() { - LocalDate now = LocalDate.now(); + LocalDate now = LocalDate.now().minusDays(-5); maintenancePlanService.createTask(now); } } diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/Device.java b/src/main/java/org/springblade/modules/business/pojo/entity/Device.java index e47ba1b..c9b6ecc 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/Device.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/Device.java @@ -106,4 +106,9 @@ public class Device extends BaseEntity { * 房间名称 */ private String roomName; + + /** + * 是否过保（0没有过保 1已过保） + */ + private Integer isWarran; } diff --git a/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java index d2a9294..4104d14 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java @@ -213,6 +213,7 @@ public class DeviceServiceImpl extends BaseServiceImpl imp LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(Device.class) .eq(Device::getLimsId, device.getLimsId()) .eq(Device::getFloorId, device.getFloorId()) + .eq(Device::getIsWarran, 0) .eq(Device::getRoomId, device.getRoomId()); List devices = this.list(wrapper); diff --git a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java index 003ee9c..ca15912 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java @@ -15,6 +15,8 @@ import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlanD import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask; import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail; import org.springblade.modules.business.service.*; +import org.springblade.modules.system.pojo.entity.User; +import org.springblade.modules.system.service.IUserService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,6 +45,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImplupdate().lambda().set(User::getIsMaintenanceClient, 1).eq(User::getDeptId, plan.getDeptId()).eq(User::getIsMaintenanceClient, 0)); + } return save; } @@ -104,14 +112,14 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl ids) { planDetailService.remove(Wrappers.lambdaQuery(MaintenancePlanDetail.class).in(MaintenancePlanDetail::getPlanId, ids)); + + // 用户修改为不是维保客户 + List plans = this.list(Wrappers.lambdaQuery(MaintenancePlan.class).in(MaintenancePlan::getId, ids)); + if (CollectionUtil.isNotEmpty(plans)) { + List deptIds = plans.stream().map(MaintenancePlan::getDeptId).toList(); + userService.update(Wrappers.update().lambda().set(User::getIsMaintenanceClient, 0).in(User::getDeptId, deptIds).eq(User::getIsMaintenanceClient, 1)); + } return this.deleteLogic(ids); } @@ -287,7 +302,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl> getLimsUsers() { + List users = userService.getLimsUsers(); + return R.data(users); + } + } diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml index e9582f7..77cb904 100644 --- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml +++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml @@ -137,7 +137,8 @@ lab_maintenance_plan WHERE is_deleted = 0 - AND create_user = #{createUser}) + + ) AND tenant_id = #{tenantId} ORDER BY sort diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java index 3279bcf..958c248 100644 --- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java +++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java @@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.modules.system.excel.UserExcel; import org.springblade.modules.system.pojo.entity.User; +import org.springblade.modules.system.pojo.vo.LimsUserVO; import java.util.List; @@ -78,4 +79,8 @@ public interface UserMapper extends BaseMapper { */ List exportUser(@Param("ew") Wrapper queryWrapper); + /** + * 获取客服下绑定实验室所有用户 + */ + List getLimsUsers(@Param("userId") Long userId); } diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml index 5480d1c..2fc3dca 100644 --- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml +++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml @@ -84,5 +84,27 @@ + diff --git a/src/main/java/org/springblade/modules/system/pojo/entity/User.java b/src/main/java/org/springblade/modules/system/pojo/entity/User.java index 5c3aeef..ff63cdc 100644 --- a/src/main/java/org/springblade/modules/system/pojo/entity/User.java +++ b/src/main/java/org/springblade/modules/system/pojo/entity/User.java @@ -123,7 +123,7 @@ public class User extends TenantEntity { */ private String addressLat; /** - * 是否维保客户 + * 是否维保客户 0否 1是 */ private Integer isMaintenanceClient; diff --git a/src/main/java/org/springblade/modules/system/pojo/vo/LimsUserVO.java b/src/main/java/org/springblade/modules/system/pojo/vo/LimsUserVO.java new file mode 100644 index 0000000..e7f225e --- /dev/null +++ b/src/main/java/org/springblade/modules/system/pojo/vo/LimsUserVO.java @@ -0,0 +1,76 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.modules.system.pojo.vo; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.modules.system.pojo.entity.User; + +import java.io.Serial; + +/** + * 视图实体类 + * + * @author Chill + */ +@Data +public class LimsUserVO { + + /** + * 主键ID + */ + private Long id; + + /** + * 租户名 + */ + private String name; + + /** + * 用户平台名 + */ + private String phone; + + /** + * 角色名 + */ + private Long deptId; + + /** + * 部门名 + */ + private String deptName; + + /** + * 岗位名 + */ + private Long createDept; + +} diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java index 026d1db..477d774 100644 --- a/src/main/java/org/springblade/modules/system/service/IUserService.java +++ b/src/main/java/org/springblade/modules/system/service/IUserService.java @@ -35,6 +35,7 @@ import org.springblade.modules.system.pojo.entity.User; import org.springblade.modules.system.pojo.entity.UserInfo; import org.springblade.modules.system.pojo.entity.UserOauth; import org.springblade.modules.system.excel.UserExcel; +import org.springblade.modules.system.pojo.vo.LimsUserVO; import org.springblade.modules.system.pojo.vo.UserVO; import java.util.List; @@ -273,4 +274,9 @@ public interface IUserService extends BaseService { * @return */ boolean auditRefuse(String userIds); + + /** + * 获取客服下绑定实验室所有用户 + */ + List getLimsUsers(); } diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java index ee3bd0d..e4af00f 100644 --- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java +++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.qiniu.util.Auth; import lombok.AllArgsConstructor; import org.springblade.common.cache.*; import org.springblade.common.constant.CommonConstant; @@ -52,6 +53,7 @@ import org.springblade.modules.auth.provider.UserType; import org.springblade.modules.system.excel.UserExcel; import org.springblade.modules.system.mapper.UserMapper; import org.springblade.modules.system.pojo.entity.*; +import org.springblade.modules.system.pojo.vo.LimsUserVO; import org.springblade.modules.system.pojo.vo.UserVO; import org.springblade.modules.system.service.IRoleService; import org.springblade.modules.system.service.IUserDeptService; @@ -544,4 +546,9 @@ public class UserServiceImpl extends BaseServiceImpl implement return changeStatus(Func.toLongList(userIds), StatusType.DISABLED.getType()); } + @Override + public List getLimsUsers() { + return baseMapper.getLimsUsers(AuthUtil.getUserId()); + } + } From 17b1497ebd427c3015cf01fd4bada91315368c41 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Tue, 17 Dec 2024 17:50:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BB=B4=E4=BF=AE=E7=BB=93=E6=9E=9C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=85=B3=E9=97=AD=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/business/contraller/WorkOrderController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java index 20265ed..af2f42b 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java @@ -356,9 +356,10 @@ public class WorkOrderController extends BladeController { @ApiLog(value = "提报管理-维修人员提交维修结果") @PostMapping("/serviceman-repair-submit") public R servicemanRepairSubmit(@RequestBody WorkOrder workOrder) { - workOrder = workOrderService.getById(workOrder.getId()); - workOrder.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue()); - workOrderService.updateById(workOrder); + WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); + workOrderOld.setCloseReason(workOrder.getCloseReason()); + workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue()); + workOrderService.updateById(workOrderOld); // todo 审核通过 From 6123f641a029b0cb9fef8b8761cb5b835afd2ba2 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Tue, 17 Dec 2024 17:53:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/business/service/impl/DeviceServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java index 4104d14..33c4f2f 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java @@ -4,7 +4,6 @@ package org.springblade.modules.business.service.impl; import com.aliyun.oss.ServiceException; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -239,11 +238,9 @@ public class DeviceServiceImpl extends BaseServiceImpl imp return; } - // 更新设备状态为故障 - UpdateWrapper updateWrapper = new UpdateWrapper<>(Device.class); - updateWrapper.eq("id", id); - updateWrapper.set("run_status", status); - this.update(updateWrapper); + Device device = getById(id); + device.setRunStatus(status); + updateById(device); } /**