Merge remote-tracking branch 'origin/master'

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);
     }
 }

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 workOrderOld = workOrderService.getById(workOrder.getId());
-		workOrder.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue());
+		workOrderOld.setCloseReason(workOrder.getCloseReason());
-		workOrderService.updateById(workOrder);
+		workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue());
+		workOrderService.updateById(workOrderOld);
 
 		// todo 审核通过
 

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;
 }

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;
@@ -213,6 +212,7 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceMapper, Device> imp
         LambdaQueryWrapper<Device> 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<Device> devices = this.list(wrapper);
 
@@ -238,11 +238,9 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceMapper, Device> imp
 			return;
 		}
 
-		// 更新设备状态为故障
+		Device device = getById(id);
-		UpdateWrapper updateWrapper = new UpdateWrapper<>(Device.class);
+		device.setRunStatus(status);
-		updateWrapper.eq("id", id);
+		updateById(device);
-		updateWrapper.set("run_status", status);
-		this.update(updateWrapper);
 	}
 
 	/**

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 BaseServiceImpl<MaintenancePlanM
     private final IMaintenanceTaskService taskService;
     private final IMaintenanceTaskDetailService taskDetailService;
     private final IDeviceAttachService deviceAttachService;
+    private final IUserService userService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -82,6 +85,11 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
             });
             save = deviceAttachService.saveBatch(draws);
         }
+
+        // 修改该实验室下所有用户为维保客户
+        if (plan.getDeptId() != null) {
+            save = userService.update(Wrappers.<User>update().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<MaintenancePlanM
                     saveList.add(detail);
                 }
             }
+            // 需要删除
+            planDetailService.remove(Wrappers.lambdaQuery(MaintenancePlanDetail.class)
+                    .eq(MaintenancePlanDetail::getPlanId, plan.getId())
+                    .notIn(CollectionUtils.isNotEmpty(ids), MaintenancePlanDetail::getId, ids));
             // 需要修改
             planDetailService.updateBatchById(updateList);
             // 需要新增
             planDetailService.saveBatch(saveList);
-            // 需要删除
-            planDetailService.remove(Wrappers.lambdaQuery(MaintenancePlanDetail.class)
-                    .eq(MaintenancePlanDetail::getDeviceId, plan.getId())
-                    .notIn(CollectionUtils.isNotEmpty(ids), MaintenancePlanDetail::getId, ids));
         }
 
         // 保存附件
@@ -170,6 +178,13 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
     @Transactional(rollbackFor = Exception.class)
     public boolean planRemove(List<Long> ids) {
         planDetailService.remove(Wrappers.lambdaQuery(MaintenancePlanDetail.class).in(MaintenancePlanDetail::getPlanId, ids));
+
+        // 用户修改为不是维保客户
+        List<MaintenancePlan> plans = this.list(Wrappers.lambdaQuery(MaintenancePlan.class).in(MaintenancePlan::getId, ids));
+        if (CollectionUtil.isNotEmpty(plans)) {
+            List<Long> deptIds = plans.stream().map(MaintenancePlan::getDeptId).toList();
+            userService.update(Wrappers.<User>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<MaintenancePlanM
             maintenanceTask.setTaskStatus(MaintenanceStatusEnum.TASK_CREATE.getValue());
             maintenanceTask.setRepairStatus(MaintenanceStatusEnum.REPAIR_NO.getValue());
             maintenanceTask.setDeptName(maintenancePlan.getDeptName());
-
+            maintenanceTask.setStatus(0);
             taskService.save(maintenanceTask);
 
             // 保存任务详情

src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -57,6 +57,7 @@ import org.springblade.core.tool.utils.StringPool;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.excel.UserImporter;
 import org.springblade.modules.system.pojo.entity.User;
+import org.springblade.modules.system.pojo.vo.LimsUserVO;
 import org.springblade.modules.system.pojo.vo.UserVO;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IUserService;
@@ -379,4 +380,14 @@ public class UserController {
 		String coordinate = CacheUtil.get(SYS_CACHE, "coordinate:id:", userId, String.class);
 		return R.data(coordinate);
 	}
+
+	/**
+	 * 获取客服下绑定实验室所有用户
+	 */
+	@GetMapping("/getLimsUsers")
+	public R<List<LimsUserVO>> getLimsUsers() {
+		List<LimsUserVO> users = userService.getLimsUsers();
+		return R.data(users);
+	}
+
 }

src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -137,7 +137,8 @@
                 lab_maintenance_plan
             WHERE
                 is_deleted = 0
-                <if test = "tenantId!=null and tenantId!=''" >AND create_user = #{createUser}</if>)
+<!--                <if test = "createUser!=null and createUser!=''" >AND create_user = #{createUser}</if>-->
+            )
         <if test = "tenantId!=null and tenantId!=''" >AND tenant_id = #{tenantId}</if>
         ORDER BY sort
     </select>

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<User> {
 	 */
 	List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
 
+	/**
+	 * 获取客服下绑定实验室所有用户
+	 */
+    List<LimsUserVO> getLimsUsers(@Param("userId") Long userId);
 }

src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -84,5 +84,27 @@
     <select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
         SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
     </select>
+    <select id="getLimsUsers" resultType="org.springblade.modules.system.pojo.vo.LimsUserVO">
+        SELECT
+            id,
+            name,
+            phone,
+            dept_id AS deptId,
+            dept_name AS deptName,
+            create_dept AS createDept
+        FROM
+            blade_user
+        WHERE
+            is_deleted = 0
+          AND dept_id IN (
+            SELECT
+                dept_id
+            FROM
+                lab_maintenance_plan
+            WHERE
+                is_deleted = 0
+<!--            <if test = "userId!=null and userId!=''" >AND create_user = #{userId}</if>-->
+        )
+    </select>
 
 </mapper>

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;
 

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.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * 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;
+
+}

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<User> {
 	 * @return
 	 */
 	boolean auditRefuse(String userIds);
+
+	/**
+	 * 获取客服下绑定实验室所有用户
+	 */
+    List<LimsUserVO> getLimsUsers();
 }

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<UserMapper, User> implement
 		return changeStatus(Func.toLongList(userIds), StatusType.DISABLED.getType());
 	}
 
+	@Override
+	public List<LimsUserVO> getLimsUsers() {
+		return baseMapper.getLimsUsers(AuthUtil.getUserId());
+	}
+
 }