嘉禾二期

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InspectionTaskController.java

@@ -31,16 +31,7 @@ public class InspectionTaskController extends BladeController {
 
     @GetMapping("/page")
     public R<Object> page(InspectionTask entry, Query query) {
-        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
-        if(!roles.contains("admin") && !roles.contains("政府")){
-            if(roles.contains("巡检管理")){
-                entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
-            }
-            if(roles.contains("巡检人员")){
-                List<String> groupIdList = Arrays.asList(AuthUtil.getDeptId().split(","));
-                entry.setGroupIdList(groupIdList);
-            }
-        }
+
         return R.data(service.findPage(entry, query));
     }
 

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskController.java

@@ -7,15 +7,11 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.lims.entry.MaintainTask;
 import org.springblade.lims.service.IMaintainTaskService;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.List;
-
 
 /**
  * @author sjx
@@ -31,16 +27,6 @@ public class MaintainTaskController extends BladeController {
 
     @GetMapping("/page")
     public R<Object> page(MaintainTask entry, Query query) {
-        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
-        if(!roles.contains("admin") && !roles.contains("政府")){
-            if(roles.contains("保养管理")){
-                entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
-            }
-            if(roles.contains("保养人员")){
-                List<String> groupIdList = Arrays.asList(AuthUtil.getDeptId().split(","));
-                entry.setGroupIdList(groupIdList);
-            }
-        }
         return R.data(service.findPage(entry, query));
     }
 

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionPointServiceImpl.java

@@ -15,6 +15,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.lims.entry.*;
 import org.springblade.lims.mapper.InspectionPointMapper;
@@ -72,9 +73,15 @@ public class InspectionPointServiceImpl extends BaseServiceImpl<InspectionPointM
             InspectionPointPos pointPos = pointPosService.getById(point.getPosId());
             InspectionRoute route = routeService.getById(point.getRouteId());
             Instrument instrument = instrumentService.getById(point.getAssetId());
-            point.setPosHierarchy(pointPos.getHierarchyName());
-            point.setRouteName(route.getName());
-            point.setAssetName(instrument.getName());
+            if(ObjectUtil.isNotEmpty(pointPos)){
+                point.setPosHierarchy(pointPos.getHierarchyName());
+            }
+            if(ObjectUtil.isNotEmpty(route)){
+                point.setRouteName(route.getName());
+            }
+            if(ObjectUtil.isNotEmpty(instrument)){
+                point.setAssetName(instrument.getName());
+            }
             List<InspectionPointItem> itemList = inspectionPointItemService.list(new LambdaQueryWrapper<InspectionPointItem>().eq(InspectionPointItem::getPointId,point.getId()));
             if(CollectionUtils.isNotEmpty(itemList)){
                 point.setItemSize(itemList.size());

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionTaskServiceImpl.java

@@ -21,10 +21,13 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.lims.entry.*;
 import org.springblade.lims.mapper.InspectionTaskMapper;
 import org.springblade.lims.service.*;
+import org.springblade.system.cache.SysCache;
+import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -78,10 +81,24 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         if(CollectionUtils.isNotEmpty(entry.getGroupIdList())){
             wrapper.in(InspectionTask::getGroupId,entry.getGroupIdList());
         }
-        if(entry.getCreateDept() != null){
-            wrapper.eq(BaseEntity::getCreateDept,entry.getCreateDept());
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin") && !roles.contains("政府")){
+            /*if(roles.contains("巡检管理")){
+                entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+            }*/
+            if(roles.contains("巡检人员")){
+                List<String> groupIdList = Arrays.asList(AuthUtil.getDeptId().split(","));
+                entry.setGroupIdList(groupIdList);
+            }else{
+                List<Long> deptIds = new ArrayList<>();
+                List<Dept> depts = SysCache.getDeptChild(Long.parseLong(AuthUtil.getDeptId()));
+                if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(depts)){
+                    deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+                }
+                deptIds.add(Long.parseLong(AuthUtil.getDeptId()));
+                wrapper.in(BaseEntity::getCreateDept,deptIds);
+            }
         }
-
         wrapper.eq(BaseEntity::getIsDeleted,0);
         wrapper.orderByDesc(InspectionTask::getCreateTime);
         IPage<InspectionTask> page = this.page(Condition.getPage(query), wrapper);

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainPlanServiceImpl.java

@@ -60,7 +60,7 @@ public class MaintainPlanServiceImpl extends BaseServiceImpl<MaintainPlanMapper,
             wrapper.eq(MaintainPlan::getCode, entry.getCode());
         }
         if (StringUtils.isNotBlank(entry.getName())) {
-            wrapper.eq(MaintainPlan::getName, entry.getName());
+            wrapper.like(MaintainPlan::getName, entry.getName());
         }
         if (StringUtils.isNotBlank(entry.getCycleMethod())) {
             wrapper.eq(MaintainPlan::getCycleMethod, entry.getCycleMethod());

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainTaskServiceImpl.java

@@ -23,9 +23,13 @@ import org.springblade.lims.service.IMaintainProjectService;
 import org.springblade.lims.service.IMaintainRecordService;
 import org.springblade.lims.service.IMaintainTaskProjectService;
 import org.springblade.lims.service.IMaintainTaskService;
+import org.springblade.system.cache.SysCache;
+import org.springblade.system.entity.Dept;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -89,8 +93,23 @@ public class MaintainTaskServiceImpl extends BaseServiceImpl<MaintainTaskMapper,
         if(CollectionUtils.isNotEmpty(entry.getGroupIdList())){
             wrapper.in(MaintainTask::getGroupId,entry.getGroupIdList());
         }
-        if(entry.getCreateDept() != null){
-            wrapper.eq(MaintainTask::getCreateDept,entry.getCreateDept());
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin") && !roles.contains("政府")){
+            /*if(roles.contains("保养管理")){
+                entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+            }*/
+            if(roles.contains("保养人员")){
+                List<String> groupIdList = Arrays.asList(AuthUtil.getDeptId().split(","));
+                entry.setGroupIdList(groupIdList);
+            }else{
+                List<Long> deptIds = new ArrayList<>();
+                List<Dept> depts = SysCache.getDeptChild(Long.parseLong(AuthUtil.getDeptId()));
+                if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(depts)){
+                    deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList());
+                }
+                deptIds.add(Long.parseLong(AuthUtil.getDeptId()));
+                wrapper.in(BaseEntity::getCreateDept,deptIds);
+            }
         }
 
         wrapper.eq(BaseEntity::getIsDeleted,0);