Merge remote-tracking branch 'origin/master'

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -89,13 +89,14 @@ public class MaintenanceController extends BladeController {
 
     /*---------- 维修任务开始 ----------*/
 
-    @PostMapping("/task-create")
+	@PostMapping("/task-create")
-    @Operation(summary = "定时任务-根据维保计划生成维保任务", description = "定时任务-根据维保计划生成维保任务")
+	@Operation(summary = "定时任务-根据维保计划生成维保任务", description = "定时任务-根据维保计划生成维保任务")
-    public R taskCreate() {
+	public R taskCreate() {
-        LocalDate now = LocalDate.now();
+		// 提前五天生成
-        // 注意要查询上一次巡检计划中发现但未维修的
+		LocalDate now = LocalDate.now().minusDays(-5);
-        return R.status(planService.createTask(now));
+		// 注意要查询上一次巡检计划中发现但未维修的
-    }
+		return R.status(planService.createTask(now));
+	}
 
     @GetMapping("/task-page")
     @Operation(summary = "维保任务列表", description = "维保任务列表")

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

@@ -71,7 +71,7 @@ public interface DeptMapper extends BaseMapper<Dept> {
 	 * @param tenantId
 	 * @return
 	 */
-	List<DeptVO> assLimsTree(@Param("tenantId")String tenantId, @Param("createUser") Long createUser);
+	List<DeptVO> assLimsTree(String tenantId);
 
 	/**
 	 * 懒加载获取树形节点

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

@@ -120,26 +120,11 @@
         </foreach>
         and is_deleted = 0
     </select>
-    <select id="assLimsTree" resultType="org.springblade.modules.system.pojo.vo.DeptVO">
+    <select id="assLimsTree" resultMap="treeNodeResultMap">
-        SELECT
+        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0 and dept_category = 5
-            id,
+        <if test="_parameter!=null and _parameter!=''">
-            parent_id,
+            and tenant_id = #{_parameter}
-            dept_name AS title,
+        </if>
-            id AS "value",
-            id AS "key"
-        FROM
-            blade_dept
-        WHERE
-            is_deleted = 0 AND dept_category = 5 AND id IN (
-            SELECT
-                dept_id
-            FROM
-                lab_maintenance_plan
-            WHERE
-                is_deleted = 0
-<!--                <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.xml

@@ -86,17 +86,17 @@
     </select>
     <select id="getLimsUsers" resultType="org.springblade.modules.system.pojo.vo.LimsUserVO">
         SELECT
-            id,
+             u.id AS id,
-            name,
+            u.name AS name,
-            phone,
+            u.phone AS phone,
-            dept_id AS deptId,
+            u.dept_id AS deptId,
-            dept_name AS deptName,
+            d.dept_name AS deptName,
-            create_dept AS createDept
+            u.create_dept AS createDept
         FROM
-            blade_user
+            blade_user u left join blade_dept d on u.dept_id = d.id
         WHERE
-            is_deleted = 0
+            u.is_deleted = 0
-          AND dept_id IN (
+          AND u.dept_id IN (
             SELECT
                 dept_id
             FROM

src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -190,7 +190,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 
 	@Override
 	public List<DeptVO> assLimsTree(String tenantId) {
-		return baseMapper.assLimsTree(tenantId, AuthUtil.getUserId());
+		return baseMapper.assLimsTree(tenantId);
 	}
 
 }