功能修改

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

@@ -76,8 +76,20 @@ public class InvoiceApplyController extends BladeController {
 	public R<IPage<InvoiceApply>> page(InvoiceApply apply, Query query) {
 		LambdaQueryWrapper<InvoiceApply> wrapper = Wrappers.lambdaQuery(apply).orderByDesc(InvoiceApply::getCreateTime);
 		BladeUser user = AuthUtil.getUser();
+		List<String> deptIds = null;
 		if(!user.getRoleName().contains("administrator") && !user.getRoleName().contains("admin")){
-			wrapper.eq(BaseEntity::getCreateDept,user.getDeptId());
+			if(user.getRoleName().equals("客服") || user.getRoleName().equals("维修负责人")){
+				String deptId = user.getDeptId();
+				List<Dept> deptList = deptService.list(Wrappers.lambdaQuery(Dept.class).eq(Dept::getParentId,deptId).eq(Dept::getIsDeleted,0));
+				if(CollectionUtil.isNotEmpty(deptList)){
+					deptIds = deptList.stream().map(Dept::getId).map(x->x+"").collect(Collectors.toList());
+				}
+			}else{
+				deptIds = new ArrayList<>();
+				String deptId = user.getDeptId();
+				deptIds.add(deptId);
+			}
+			wrapper.in(BaseEntity::getCreateDept,deptIds);
 		}
 		IPage<InvoiceApply> pages = this.applyService.page(Condition.getPage(query), wrapper);
 		return R.data(pages);

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

@@ -88,11 +88,13 @@ public class WorkOrderController extends BladeController {
         LambdaQueryWrapper<WorkOrder> wrapper = Wrappers.lambdaQuery(WorkOrder.class);
         //客服、维修负责人查询所属运维中心下所有实验室的需求提报
         BladeUser user = AuthUtil.getUser();
-        List<String> deptIds = null;
+        List<String> deptIds;
         String deptId = user.getDeptId();
         List<Dept> deptList = deptService.list(Wrappers.lambdaQuery(Dept.class).eq(Dept::getParentId,deptId).eq(Dept::getIsDeleted,0));
         if(CollectionUtil.isNotEmpty(deptList)){
             deptIds = deptList.stream().map(Dept::getId).map(x->x+"").collect(Collectors.toList());
+        } else {
+            deptIds = null;
         }
 
         // 数据权限
@@ -106,14 +108,12 @@ public class WorkOrderController extends BladeController {
                     // 客服
                     // eq.in(WorkOrder::getCreateDept, Func.toLongList(AuthUtil.getDeptId()));
                     wrapper.ne(WorkOrder::getStatus, WorkOrderStatusEnum.KH_ORDER_DRAFT.getValue());
-                    wrapper.in(WorkOrder::getReportUnit,deptIds);
-                    wrapper.or().eq(WorkOrder::getReportUnit,user.getDeptId());
+                    wrapper.and(wrp -> wrp.in(WorkOrder::getReportUnit,deptIds).or().eq(WorkOrder::getReportUnit,user.getDeptId()));
                     break;
                 case "3":
                     // 维修负责人
                     wrapper.ne(WorkOrder::getStatus, WorkOrderStatusEnum.KH_ORDER_DRAFT.getValue());
-                    wrapper.in(WorkOrder::getReportUnit,deptIds);
-                    wrapper.or().eq(WorkOrder::getReportUnit,user.getDeptId());
+                    wrapper.and(wrp -> wrp.in(WorkOrder::getReportUnit,deptIds).or().eq(WorkOrder::getReportUnit,user.getDeptId()));
                     break;
                 case "4":
                     // 维修人员
@@ -148,7 +148,7 @@ public class WorkOrderController extends BladeController {
         if (StringUtils.isNotBlank(workOrderDTO.getRepairPersonName())) {
             // 根据维修人员的名字模糊查询用户列表
             List<User> userList = userService.list(Wrappers.lambdaQuery(User.class)
-                    .like(User::getName, workOrderDTO.getRepairPersonName()));
+                    .like(User::getRealName, workOrderDTO.getRepairPersonName()));
 
             if (!userList.isEmpty()) {
                 List<Long> userIds = userList.stream().map(User::getId).collect(Collectors.toList());
@@ -177,7 +177,7 @@ public class WorkOrderController extends BladeController {
             }
             User user1 = userService.getById(order.getRepairPerson());
             if (Func.isNotEmpty(user1)) {
-                order.setRepairPersonName(user1.getName());
+                order.setRepairPersonName(user1.getRealName());
             }
         });
 

src/main/java/org/springblade/modules/business/contraller/supplies/ApplyController.java

@@ -78,7 +78,14 @@ public class ApplyController extends BladeController {
             }
         }
         if(StringUtils.isNotEmpty(apply.getApplyUser())){
-            wrapper.eq(Apply::getApplyUser,apply.getApplyUser());
+            wrapper.like(Apply::getApplyUser,apply.getApplyUser());
+        }
+        if(apply.getStartTime() != null){
+            wrapper.ge(Apply::getApplyTime,apply.getStartTime());
+        }
+
+        if(apply.getEndTime() != null){
+            wrapper.le(Apply::getApplyTime,apply.getEndTime());
         }
         IPage<Apply> pages = applyService.page(Condition.getPage(query), wrapper);
         List<Apply> records = pages.getRecords();

src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceOutputData.java

@@ -17,8 +17,8 @@ public class MaintenanceOutputData {
     //房间
     private String deptName;
 
-    //专业名称
-    private String majorName;
+    //设备名称
+    private String deviceName;
 
     //巡检内容
     private String checkContent;

src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskDetailServiceImpl.java

@@ -108,7 +108,7 @@ public class MaintenanceTaskDetailServiceImpl extends BaseServiceImpl<Maintenanc
             maintenanceOutputData.setNo(no);
             maintenanceOutputData.setFloor(maintenanceTaskDetail.getFloorName());
             maintenanceOutputData.setDeptName(maintenanceTaskDetail.getDeptName());
-            maintenanceOutputData.setMajorName(maintenanceTaskDetail.getMajorName());
+            maintenanceOutputData.setDeviceName(maintenanceTaskDetail.getDeviceName());
             maintenanceOutputData.setCheckContent(maintenanceTaskDetail.getCheckContent());
             Optional<Integer> status = Optional.ofNullable(maintenanceTaskDetail.getStatus());
             if (status.isPresent()) {
@@ -239,7 +239,7 @@ public class MaintenanceTaskDetailServiceImpl extends BaseServiceImpl<Maintenanc
                     maintenanceOutputData.setNo(no);
                     maintenanceOutputData.setFloor(maintenanceTaskDetail.getFloorName());
                     maintenanceOutputData.setDeptName(maintenanceTaskDetail.getDeptName());
-                    maintenanceOutputData.setMajorName(maintenanceTaskDetail.getMajorName());
+                    maintenanceOutputData.setDeviceName(maintenanceTaskDetail.getDeviceName());
                     maintenanceOutputData.setCheckContent(maintenanceTaskDetail.getCheckContent());
                     Optional<Integer> status = Optional.ofNullable(maintenanceTaskDetail.getStatus());
                     if (status.isPresent()) {

src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

@@ -110,7 +110,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         User user = UserCache.getUser(workOrderVO.getInformant());
         workOrderVO.setInformantName(user != null ? user.getRealName() : "");
         Dept dept = deptService.getOne(Wrappers.lambdaQuery(Dept.class).eq(Dept::getId, workOrderVO.getReportUnit()));
-        workOrderVO.setReportUnitName(dept.getDeptName());
+        if(dept != null){
+            workOrderVO.setReportUnitName(dept.getDeptName());
+        }
         // 维修班组
         workOrderVO.setMaintenanceTeamName(SysCache.getDeptName(workOrderVO.getMaintenanceTeam()));
         // 维修人员