提交首页接口

src/main/java/com/repair/api/RepairClassesSettingsControllerAPI.java

@@ -3,6 +3,7 @@ package com.repair.api;
 import com.repair.model.request.insertRepairClassesRequest;
 import com.repair.model.request.updateRepairClassesRequest;
 import com.repair.model.result.CommonResult;
+import com.repair.model.vo.UserScheduleVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
@@ -46,4 +47,12 @@ public interface RepairClassesSettingsControllerAPI {
     @GetMapping(value = "/downloadRepairClassesSettingExcel")
     @ApiOperation(value = "导出排班模板", notes = "导出排班模板", httpMethod = "GET")
     void downloadRepairClassesSettingExcel(HttpServletResponse response);
+
+    @GetMapping(value = "/queryPageUserClasses")
+    @ApiOperation(value = "移动端首页当天排班分页数据", notes = "移动端首页当天排班分页数据", httpMethod = "GET")
+    CommonResult queryPageUserClasses(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam int schoolId);
+
+    @PostMapping(value = "/updateUserClasses")
+    @ApiOperation(value = "移动端首页修改或新增当天排班数据", notes = "移动端首页修改或新增当天排班数据", httpMethod = "POST")
+    CommonResult updateUserClasses(@Validated @RequestBody UserScheduleVo usv, BindingResult bindingResult) throws ParseException;
 }

src/main/java/com/repair/api/RepairRecordControllerAPI.java

@@ -164,10 +164,13 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/reportExport")
     @ApiOperation(value = "报表导出", notes = "报表导出", httpMethod = "GET")
-void reportExport(HttpServletResponse response,String keyWord, String startTime, String endTime, Integer schoolId, @RequestParam Integer state, @RequestHeader("user_head") String userhead) throws Exception;
+    void reportExport(HttpServletResponse response,String keyWord, String startTime, String endTime, Integer schoolId, @RequestParam Integer state, @RequestHeader("user_head") String userhead) throws Exception;
 
     @GetMapping(value = "/queryMasterHomeCount")
     @ApiOperation(value = "维修师傅首页头部数量", notes = "维修师傅首页头部数量", httpMethod = "GET")
     CommonResult queryMasterHomeCount(@RequestParam int userId);
 
+    @GetMapping(value = "/queryLogisticHomeCount")
+    @ApiOperation(value = "郭师傅和后勤首页头部数量", notes = "郭师傅和后勤首页头部数量", httpMethod = "GET")
+    CommonResult queryLogisticHomeCount(@RequestParam int schoolId);
 }

src/main/java/com/repair/api/RepairUserControllerAPI.java

@@ -50,4 +50,8 @@ public interface RepairUserControllerAPI {
     @GetMapping(value = "/queryPageCollaborator")
     @ApiOperation(value = "获取协作审核下拉人员分页数据", notes = "获取协作审核下拉人员分页数据", httpMethod = "GET")
     CommonResult queryPageCollaborator(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam Integer schoolId,@RequestParam Integer userId);
+
+    @GetMapping(value = "/queryPositiveReviewPage")
+    @ApiOperation(value = "工单完成排行榜分页数据", notes = "工单完成排行榜分页数据", httpMethod = "GET")
+    CommonResult queryPositiveReviewPage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam Integer schoolId);
 }

src/main/java/com/repair/controller/LoginController.java

@@ -327,6 +327,7 @@ public class LoginController implements LoginControllerAPI {
                 btns.add("接单");
                 btns.add("报价");
                 btns.add("维修完成");
+                btns.add("派单");
                 break;
             //后勤
             //eUserZZ.Logistics.getValue()：3

src/main/java/com/repair/controller/RepairClassesSettingsController.java

@@ -39,7 +39,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
+import java.time.Instant;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -244,6 +246,101 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
     }
 
     @Override
+    public CommonResult queryPageUserClasses(int currentPage, int pageCount, int schoolId) {
+        PageUtils<AddressBookVo> result = repairUserService.queryUserPageBySchoolId(currentPage, pageCount, schoolId);
+        List<Integer> userIds = result.getList().stream().map(AddressBookVo::getId).collect(Collectors.toList());
+
+        List<ClassesDataVo> users = repairClassesSettingsService.queryClassesDatas(userIds, schoolId);
+
+        List<UserScheduleVo> results = new ArrayList<>();
+        for (AddressBookVo ru : result.getList()) {
+            UserScheduleVo dataV = new UserScheduleVo();
+            dataV.setId(ru.getId());
+            dataV.setUserName(ru.getUserName());
+            dataV.setUserPhone(ru.getUserPhone());
+            dataV.setWorkTypeName(ru.getWorkTypeName());
+            dataV.setState(ru.getState());
+            dataV.setStateStr(ru.getStateStr());
+            Optional<ClassesDataVo> data = users.stream().filter(e -> Integer.valueOf(e.getUserId()).equals(ru.getId())).findFirst();
+            if (data != null && data.isPresent()) {
+                dataV.setShifts(data.get().getShifts());
+                dataV.setClassId(data.get().getId());
+            }
+            results.add(dataV);
+        }
+
+        PageUtils resultPage = new PageUtils(results, result.getTotalCount(), result.getTotalPage(), result.getCurrPage());
+        return CommonResult.ok(resultPage);
+    }
+
+    @Override
+    public CommonResult updateUserClasses(UserScheduleVo usv, BindingResult bindingResult) throws ParseException {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        RepairUser user = repairUserService.getRepairById(usv.getId());
+        if (user == null) {
+            return CommonResult.fail("用户信息失效，修改失败");
+        }
+
+        if (!user.getState().equals(usv.getState())) {
+            user.setState(usv.getState());
+            int updateUser = repairUserService.updateRepairUser(user);
+            if (updateUser <= 0) {
+                return CommonResult.fail("用户信息更新失败");
+            }
+        }
+        if (usv.getShifts() != null && usv.getShifts().size() > 0) {
+            List<String> shifts = usv.getShifts().stream().map(ShiftSettingDataVo::getId).distinct().collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
+
+            List<RepairShiftSettings> datas = repairShiftSettingsService.getRepairsByShiftIds(shifts);
+            for (int i = 0; i < datas.size(); i++) {
+                for (int j = i + 1; j < datas.size(); j++) {
+                    boolean isOver = TimeExchange.overlapping(datas.get(i).getStartTime(), datas.get(i).getEndTime(), datas.get(j).getStartTime(), datas.get(j).getEndTime());
+                    if (isOver) {
+                        return CommonResult.fail(datas.get(i).getStartTime() + "-" + datas.get(i).getEndTime() + "时间段和" + datas.get(j).getStartTime() + "-" + datas.get(j).getEndTime() + "时间段存在重叠");
+                    }
+                }
+            }
+
+            RepairClassesSettings rcs = new RepairClassesSettings();
+            //为空则新增排班数据
+            if (usv.getClassId() == null) {
+                //判断对应师傅当天排班数据是否存在
+                ClassesDataVo csv = repairClassesSettingsService.queryClassesData(usv.getId());
+                if (csv != null) {
+                    return CommonResult.fail("排班数据已存在，新增失败");
+                }
+
+                rcs.setUserId(usv.getId());
+                Date date = new Date();
+                Instant instant = date.toInstant();
+                ZoneId zoneId = ZoneId.systemDefault();
+                // atZone()方法返回在指定时区从此Instant生成的ZonedDateTime。
+                LocalDate localDate = instant.atZone(zoneId).toLocalDate();
+                rcs.setStartDate(localDate);
+                rcs.setShiftId(StringUtils.join(shifts, ","));
+
+                int insertClasses = repairClassesSettingsService.insertRepairClassesSettings(rcs);
+                if (insertClasses <= 0) {
+                    return CommonResult.fail("排班信息新增失败");
+                }
+            } else {
+                rcs.setShiftId(StringUtils.join(shifts, ","));
+                int updateClasses = repairClassesSettingsService.updateRepairClassesSettings(rcs);
+                if (updateClasses <= 0) {
+                    return CommonResult.fail("排班信息更新失败");
+                }
+            }
+        }
+
+        return CommonResult.ok("操作成功");
+
+    }
+
+    @Override
     public CommonResult importRepairClassesSettingExcel(MultipartFile file) throws IOException, ParseException {
         if (file.isEmpty() || file.getSize() == 0) {
             return CommonResult.fail("导入文件不能为空");

src/main/java/com/repair/controller/RepairConsumablesController.java

@@ -176,6 +176,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 }
                 RepairConsumables rcData = new RepairConsumables();
                 rcData.setRecordId(data.getRecordId());
+                rcData.setArticleId(rc.getArticleId());
                 rcData.setConsumeId(rc.getConsumeId());
                 rcData.setConsumeName(rc.getConsumeName());
                 rcData.setNumber(rc.getNumber());

src/main/java/com/repair/controller/RepairRecordController.java

@@ -1894,6 +1894,12 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
 
     @Override
+    public CommonResult queryLogisticHomeCount(int schoolId) {
+        MasterHomepageVo result = repairRecordService.queryLogisticHomeCount(schoolId);
+        return CommonResult.ok(result);
+    }
+
+    @Override
     public CommonResult mobileReply(MobileRevertRequest mrr, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);

src/main/java/com/repair/controller/RepairUserController.java

@@ -246,5 +246,11 @@ public class RepairUserController implements RepairUserControllerAPI {
         PageUtils<RepairWorkTypeVo> result = repairUserService.queryCollaboratorUser(currentPage, pageCount, schoolId, userId, dateNow);
         return CommonResult.ok(result);
     }
+
+    @Override
+    public CommonResult queryPositiveReviewPage(int currentPage, int pageCount, Integer schoolId) {
+        PageUtils<PositiveReviewVo> result = repairUserService.queryPositiveReviewPage(currentPage, pageCount, schoolId);
+        return CommonResult.ok(result);
+    }
 }
 

src/main/java/com/repair/mapper/RepairClassesSettingsMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.repair.model.pojo.RepairClassesSettings;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.vo.ClassesDataVo;
 import com.repair.model.vo.ClassesSettingVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -24,4 +25,8 @@ import java.util.Map;
 @Repository
 public interface RepairClassesSettingsMapper extends BaseMapper<RepairClassesSettings> {
     List<ClassesSettingVo> queryClassesSettingList(@Param("userIds") List<Integer> userIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<ClassesDataVo> queryClassesDatas(@Param("userIds") List<Integer> userIds, @Param("startDate") Integer startDate);
+
+    ClassesDataVo queryClassesData(@Param("userId") Integer userId);
 }

src/main/java/com/repair/mapper/RepairRecordMapper.java

@@ -62,4 +62,6 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
     List<ReportExportVo> queryTimeoutReportExport(String keyWord, String startTime, String endTime, Integer schoolId);
 
     MasterHomepageVo queryMasterHomeCount(@Param("userId") Integer userId);
+
+    MasterHomepageVo queryLogisticHomeCount(@Param("schoolId") Integer schoolId);
 }

src/main/java/com/repair/mapper/RepairUserMapper.java

@@ -29,9 +29,13 @@ public interface RepairUserMapper extends BaseMapper<RepairUser> {
 
     List<AddressBookVo> queryAddressBook(@Param("userId") Integer userId, @Param("schoolId") Integer schoolId, @Param("keyWord") String keyWord);
 
+    IPage<AddressBookVo> queryUserPageBySchoolId(IPage<AddressBookVo> page, @Param("schoolId") Integer schoolId);
+
     List<AutoDispatchUserVo> autoDispatchUser(@Param("schoolId") Integer schoolId, @Param("dateNow") String dateNow, @Param("articleId") Integer articleId, @Param("buildId") Integer buildId);
 
     IPage<AutoDispatchUserVo> autoDispatchUser(IPage<AutoDispatchUserVo> page, @Param("schoolId") Integer schoolId, @Param("dateNow") String dateNow, @Param("articleId") Integer articleId, @Param("buildId") Integer buildId, @Param("keyWord") String keyWord);
 
     IPage<RepairWorkTypeVo> queryCollaboratorUser(IPage<RepairWorkTypeVo> page, @Param("schoolId") Integer schoolId, @Param("userId") Integer userId, @Param("dateNow") String dateNow);
+
+    IPage<PositiveReviewVo> queryPositiveReviewPage(IPage<PositiveReviewVo> page, @Param("schoolId") Integer schoolId);
 }

src/main/java/com/repair/model/request/UserScheduleRequest.java

@@ -0,0 +1,54 @@
+package com.repair.model.request;
+
+import com.repair.model.vo.ShiftSettingDataVo;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/7 星期一 8:48
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class UserScheduleRequest {
+    /**
+     * 数据ID
+     */
+    @NotNull(message = "数据ID不能为空")
+    private int id;
+    /**
+     * 用户名称
+     */
+    @NotBlank(message = "师傅姓名不能为空")
+    private String userName;
+    /**
+     * 工种名称
+     */
+    @NotBlank(message = "工种名称不能为空")
+    private String workTypeName;
+    /**
+     * 接单状态ID
+     */
+    @NotNull(message = "接单状态不能为空")
+    private Integer state;
+    /**
+     * 接单状态
+     */
+    @NotBlank(message = "接单状态不能为空")
+    private String stateStr;
+
+    /**
+     * 排班ID
+     */
+    private Integer classId;
+
+    /**
+     * 排班集合
+     */
+    private List<ShiftSettingDataVo> shifts;
+
+}

src/main/java/com/repair/model/vo/ClassesDataVo.java

@@ -0,0 +1,66 @@
+package com.repair.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/28 星期五 14:35
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class ClassesDataVo {
+    /**
+     * 数据ID
+     */
+    private Integer id;
+
+    /**
+     * 用户ID
+     */
+    private int userId;
+
+    /**
+     * 师傅名称
+     */
+    private String userName;
+
+    /**
+     * 班次ID
+     */
+    @JsonIgnore
+    private String shiftId;
+
+    /**
+     * 班次名称
+     */
+    @JsonIgnore
+    private String shiftName;
+
+    /**
+     * 班次集合
+     */
+    private List<ShiftSettingDataVo> shifts;
+
+    public List<ShiftSettingDataVo> getShifts() {
+        List<String> ids = shiftId == null ? new ArrayList<>() : Arrays.asList(shiftId.split(","));
+        List<String> names = shiftName == null ? new ArrayList<>() : Arrays.asList(shiftName.split(","));
+        List<ShiftSettingDataVo> shiftList = new ArrayList<>();
+        for (int i = 0;i< names.size();i++) {
+            ShiftSettingDataVo s = new ShiftSettingDataVo();
+            s.setId(ids.get(i) == null ? 0 : Integer.valueOf(ids.get(i)));
+            s.setName(names.get(i) == null ? "" : names.get(i));
+            shiftList.add(s);
+        }
+        return shiftList;
+    }
+
+    public void setShifts(List<ShiftSettingDataVo> shifts) {
+        this.shifts = shifts;
+    }
+}

src/main/java/com/repair/model/vo/PositiveReviewVo.java

@@ -0,0 +1,32 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/7 星期一 8:48
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class PositiveReviewVo {
+    /**
+     * 数据ID
+     */
+    private int id;
+    /**
+     * 师傅姓名
+     */
+    private String userName;
+    /**
+     * 完成数
+     */
+    private int finishCount;
+    /**
+     * 好评数
+     */
+    private int evaluateCount;
+
+}

src/main/java/com/repair/model/vo/ShiftSettingDataVo.java

@@ -0,0 +1,21 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/31 星期一 10:38
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class ShiftSettingDataVo {
+    /**
+     * 班次ID
+     */
+    private int id;
+    /**
+     * 班次名称
+     */
+    private String name;
+}

src/main/java/com/repair/model/vo/UserScheduleVo.java

@@ -0,0 +1,50 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/7 星期一 8:48
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class UserScheduleVo {
+    /**
+     * 数据ID
+     */
+    private int id;
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 用户手机号
+     */
+    private String userPhone;
+    /**
+     * 工种名称
+     */
+    private String workTypeName;
+    /**
+     * 接单状态ID
+     */
+    private Integer state;
+    /**
+     * 接单状态
+     */
+    private String stateStr;
+
+    /**
+     * 排班ID
+     */
+    private Integer classId;
+
+    /**
+     * 排班集合
+     */
+    private List<ShiftSettingDataVo> shifts;
+
+}

src/main/java/com/repair/model/vo/wxLoginVo.java

@@ -32,7 +32,7 @@ public class wxLoginVo {
      * }
      * // 管理者路由adminListInfo: {
      * routes: ["首页"，"工单管理"，"待处理池"，"通讯录"]，
-     * btns: ["首页分段器”"，"表格编辑"，"工单管理分段器"，"延时"，"审核"，接单"，"报价"，"维修完成"]
+     * btns: ["首页分段器”"，"表格编辑"，"工单管理分段器"，"延时"，"审核"，接单"，"报价"，"维修完成", "派单"]
      * }
      */
     private List<String> routes;

src/main/java/com/repair/services/RepairClassesSettingsService.java

@@ -4,7 +4,9 @@ import com.repair.model.pojo.RepairClassesSettings;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.repair.model.pojo.RepairClassesSettings;
 import com.repair.model.result.PageUtils;
+import com.repair.model.vo.ClassesDataVo;
 import com.repair.model.vo.ClassesSettingVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -30,4 +32,8 @@ public interface RepairClassesSettingsService extends IService<RepairClassesSett
     List<ClassesSettingVo> getRepairByUserIds(List<Integer> userIds, String startTime, String endTime);
 
     List<RepairClassesSettings> getRepairByMonths(String monthDate);
+
+    List<ClassesDataVo> queryClassesDatas(List<Integer> userIds, Integer startDate);
+
+    ClassesDataVo queryClassesData(Integer userId);
 }

src/main/java/com/repair/services/RepairRecordService.java

@@ -77,4 +77,6 @@ public interface RepairRecordService extends IService<RepairRecord> {
     List<ReportExportVo> queryTimeoutReportExport(String keyWord, String startTime, String endTime, Integer schoolId);
 
     MasterHomepageVo queryMasterHomeCount(Integer userId);
+
+    MasterHomepageVo queryLogisticHomeCount(Integer schoolId);
 }

src/main/java/com/repair/services/RepairUserService.java

@@ -26,6 +26,8 @@ public interface RepairUserService extends IService<RepairUser> {
 
     PageUtils<RepairUser> queryPageRepairUser(int currentPage, int pageCount);
 
+    PageUtils<RepairUser> queryPageUserBySchoolId(int currentPage, int pageCount, int schoolId);
+
     List<RepairUser> queryRepairUsers();
 
     int deleteRepairUserById(int id);
@@ -46,11 +48,15 @@ public interface RepairUserService extends IService<RepairUser> {
 
     List<AddressBookVo> queryAddressBook(Integer userId, Integer schoolId, String keyWord);
 
+    PageUtils<AddressBookVo> queryUserPageBySchoolId(int currentPage, int pageCount, Integer schoolId);
+
     List<AutoDispatchUserVo> autoDispatchUser(Integer schoolId, String dateNow, Integer articleId, Integer buildId);
 
     PageUtils<AutoDispatchUserVo> autoDispatchUser(int currentPage, int pageCount, Integer schoolId, String dateNow, Integer articleId, Integer buildId, String keyWord);
 
     PageUtils<RepairWorkTypeVo> queryCollaboratorUser(int currentPage, int pageCount, Integer schoolId, Integer userId, String dateNow);
 
+    PageUtils<PositiveReviewVo> queryPositiveReviewPage(int currentPage, int pageCount, Integer schoolId);
+
 }
 

src/main/java/com/repair/services/impl/RepairClassesSettingsServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.repair.model.pojo.RepairClassesSettings;
 import com.repair.mapper.RepairClassesSettingsMapper;
 import com.repair.model.result.PageUtils;
+import com.repair.model.vo.ClassesDataVo;
 import com.repair.model.vo.ClassesSettingVo;
 import com.repair.services.RepairClassesSettingsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -76,4 +77,16 @@ public class RepairClassesSettingsServiceImpl extends ServiceImpl<RepairClassesS
         List<RepairClassesSettings> result = repairClassesSettingsMapper.selectList(queryWrapper);
         return result;
     }
+
+    @Override
+    public List<ClassesDataVo> queryClassesDatas(List<Integer> userIds, Integer startDate) {
+        List<ClassesDataVo> result = repairClassesSettingsMapper.queryClassesDatas(userIds, startDate);
+        return result;
+    }
+
+    @Override
+    public ClassesDataVo queryClassesData(Integer userId) {
+        ClassesDataVo result = repairClassesSettingsMapper.queryClassesData(userId);
+        return result;
+    }
 }

src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java

@@ -260,4 +260,10 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
         return result;
     }
 
+    @Override
+    public MasterHomepageVo queryLogisticHomeCount(Integer schoolId) {
+        MasterHomepageVo result = repairRecordMapper.queryLogisticHomeCount(schoolId);
+        return result;
+    }
+
 }

src/main/java/com/repair/services/impl/RepairUserServiceImpl.java

@@ -56,6 +56,20 @@ public class RepairUserServiceImpl extends ServiceImpl<RepairUserMapper, RepairU
     }
 
     @Override
+    public PageUtils<RepairUser> queryPageUserBySchoolId(int currentPage, int pageCount, int schoolId) {
+        //(ru.user_zzid = 1 or ru.user_zzid = 2) and school_Id = X
+        Page<RepairUser> page = new Page<>(currentPage, pageCount);
+        QueryWrapper<RepairUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("school_id",schoolId);
+        queryWrapper.and(e -> e.eq("user_zzid", 1)
+                .or()
+                .eq("user_zzid", 2));
+        IPage<RepairUser> result = repairUserMapper.selectPage(page, queryWrapper);
+        return new PageUtils(result);
+    }
+
+
+    @Override
     public List<RepairUser> queryRepairUsers() {
         QueryWrapper<RepairUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.and(e -> e.eq("user_zzid", 1)
@@ -142,6 +156,15 @@ public class RepairUserServiceImpl extends ServiceImpl<RepairUserMapper, RepairU
     }
 
     @Override
+    public PageUtils<AddressBookVo> queryUserPageBySchoolId(int currentPage, int pageCount, Integer schoolId) {
+        Page<AddressBookVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<AddressBookVo> result = repairUserMapper.queryUserPageBySchoolId(page, schoolId);
+        return new PageUtils(result);
+    }
+
+    @Override
     public List<AutoDispatchUserVo> autoDispatchUser(Integer schoolId, String dateNow, Integer articleId, Integer buildId) {
         List<AutoDispatchUserVo> result = repairUserMapper.autoDispatchUser(schoolId, dateNow, articleId, buildId);
 
@@ -165,4 +188,13 @@ public class RepairUserServiceImpl extends ServiceImpl<RepairUserMapper, RepairU
         IPage<RepairWorkTypeVo> result = repairUserMapper.queryCollaboratorUser(page, schoolId, userId, dateNow);
         return new PageUtils(result);
     }
+
+    @Override
+    public PageUtils<PositiveReviewVo> queryPositiveReviewPage(int currentPage, int pageCount, Integer schoolId) {
+        Page<PositiveReviewVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<PositiveReviewVo> result = repairUserMapper.queryPositiveReviewPage(page, schoolId);
+        return new PageUtils(result);
+    }
 }

src/main/resources/mapper/repair/RepairClassesSettingsMapper.xml

@@ -6,7 +6,6 @@
     <resultMap type="com.repair.model.vo.ClassesSettingVo" id="repairClassesListMap">
         <result property="id" column="id"/>
         <result property="userId" column="user_id"/>
-        <result property="userName" column="user_name"/>
         <result property="startDate" column="start_date"/>
         <result property="shiftId" column="shift_id"/>
         <result property="shiftName" column="shift_name"/>
@@ -30,4 +29,40 @@
             </if>
         </where>
     </select>
+
+    <resultMap type="com.repair.model.vo.ClassesDataVo" id="repairClassesDataMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="shiftId" column="shift_id"/>
+        <result property="shiftName" column="shift_name"/>
+        <result property="shiftColor" column="shift_color"/>
+    </resultMap>
+    <select id="queryClassesDatas" resultType="com.repair.model.vo.ClassesDataVo" resultMap="repairClassesDataMap">
+        SELECT rcs.id,rcs.user_id,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0
+            <if test="startDate != null and startDate != ''">
+                and rcs.start_date = CURRENT_DATE()
+            </if>
+            <if test="userIds != null and userIds.size() > 0">
+                and rcs.user_id in
+                <foreach collection="userIds" item="userId" index="index" open="(" close=")" separator=",">
+                    ${userId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryClassesData" resultType="com.repair.model.vo.ClassesDataVo" resultMap="repairClassesDataMap">
+        SELECT rcs.id,rcs.user_id,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0 and rcs.start_date = CURRENT_DATE()
+            <if test="userId != null and userId != ''">
+                and rcs.user_id = ${userId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

src/main/resources/mapper/repair/RepairUserMapper.xml

@@ -125,6 +125,18 @@
         </where>
     </select>
 
+    <select id="queryUserPageBySchoolId" resultType="com.repair.model.vo.AddressBookVo" resultMap="addressBookMap">
+        select ru.team_id,ru.id,ru.user_name,ru.user_phone,ru.work_type,rwt.name as work_type_name,ru.state,ru.state,ru.acceptance_assess_time,ru.maintenance_assess_time
+        from repair_user ru
+        left join repair_work_type rwt on rwt.deleted = 0 and rwt.id = ru.work_type
+        <where>
+            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2)
+            <if test="schoolId != null and schoolId != ''">
+                and ru.school_id = #{schoolId}
+            </if>
+        </where>
+    </select>
+
     <resultMap type="com.repair.model.vo.AutoDispatchUserVo" id="AutoDispatchUserMap">
         <result property="id" column="id"/>
         <result property="state" column="state"/>
@@ -164,4 +176,20 @@
         inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and rcs.shift_id != '' and rcs.start_date = #{dateNow}
         where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1 and ru.id != #{userId}
     </select>
+
+
+    <resultMap type="com.repair.model.vo.PositiveReviewVo" id="positiveReviewMap">
+        <result property="id" column="id"/>
+        <result property="userName" column="user_name"/>
+        <result property="finishCount" column="finish_count"/>
+        <result property="evaluateCount" column="evaluate_count"/>
+    </resultMap>
+    <select id="queryPositiveReviewPage" resultType="com.repair.model.vo.PositiveReviewVo" resultMap="positiveReviewMap">
+        select ru.id,ru.user_name, (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7 and find_in_set(ru.id,maintenancer_id)) as finish_count,
+        (select Count(*) from repair_record rr
+        inner join repair_evaluate re on re.deleted = 0 and re.star > 3 and re.record_id = rr.id
+        where rr.deleted = 0 and rr.maintenance_state = 7 and find_in_set(ru.id,rr.maintenancer_id)) as evaluate_count
+        from repair_user ru
+        where ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.school_id = #{schoolId}
+    </select>
 </mapper>

target/classes/mapper/repair/RepairClassesSettingsMapper.xml

@@ -6,7 +6,6 @@
     <resultMap type="com.repair.model.vo.ClassesSettingVo" id="repairClassesListMap">
         <result property="id" column="id"/>
         <result property="userId" column="user_id"/>
-        <result property="userName" column="user_name"/>
         <result property="startDate" column="start_date"/>
         <result property="shiftId" column="shift_id"/>
         <result property="shiftName" column="shift_name"/>
@@ -30,4 +29,40 @@
             </if>
         </where>
     </select>
+
+    <resultMap type="com.repair.model.vo.ClassesDataVo" id="repairClassesDataMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="shiftId" column="shift_id"/>
+        <result property="shiftName" column="shift_name"/>
+        <result property="shiftColor" column="shift_color"/>
+    </resultMap>
+    <select id="queryClassesDatas" resultType="com.repair.model.vo.ClassesDataVo" resultMap="repairClassesDataMap">
+        SELECT rcs.id,rcs.user_id,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0
+            <if test="startDate != null and startDate != ''">
+                and rcs.start_date = CURRENT_DATE()
+            </if>
+            <if test="userIds != null and userIds.size() > 0">
+                and rcs.user_id in
+                <foreach collection="userIds" item="userId" index="index" open="(" close=")" separator=",">
+                    ${userId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryClassesData" resultType="com.repair.model.vo.ClassesDataVo" resultMap="repairClassesDataMap">
+        SELECT rcs.id,rcs.user_id,rcs.shift_id,(select GROUP_CONCAT(name) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_name
+        FROM repair_classes_settings rcs
+        <where>
+            and rcs.deleted = 0 and rcs.start_date = CURRENT_DATE()
+            <if test="userId != null and userId != ''">
+                and rcs.user_id = ${userId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

target/classes/mapper/repair/RepairUserMapper.xml

@@ -125,6 +125,18 @@
         </where>
     </select>
 
+    <select id="queryUserPageBySchoolId" resultType="com.repair.model.vo.AddressBookVo" resultMap="addressBookMap">
+        select ru.team_id,ru.id,ru.user_name,ru.user_phone,ru.work_type,rwt.name as work_type_name,ru.state,ru.state,ru.acceptance_assess_time,ru.maintenance_assess_time
+        from repair_user ru
+        left join repair_work_type rwt on rwt.deleted = 0 and rwt.id = ru.work_type
+        <where>
+            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2)
+            <if test="schoolId != null and schoolId != ''">
+                and ru.school_id = #{schoolId}
+            </if>
+        </where>
+    </select>
+
     <resultMap type="com.repair.model.vo.AutoDispatchUserVo" id="AutoDispatchUserMap">
         <result property="id" column="id"/>
         <result property="state" column="state"/>
@@ -164,4 +176,20 @@
         inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and rcs.shift_id != '' and rcs.start_date = #{dateNow}
         where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1 and ru.id != #{userId}
     </select>
+
+
+    <resultMap type="com.repair.model.vo.PositiveReviewVo" id="positiveReviewMap">
+        <result property="id" column="id"/>
+        <result property="userName" column="user_name"/>
+        <result property="finishCount" column="finish_count"/>
+        <result property="evaluateCount" column="evaluate_count"/>
+    </resultMap>
+    <select id="queryPositiveReviewPage" resultType="com.repair.model.vo.PositiveReviewVo" resultMap="positiveReviewMap">
+        select ru.id,ru.user_name, (select Count(*) from repair_record where deleted = 0 and maintenance_state = 7 and find_in_set(ru.id,maintenancer_id)) as finish_count,
+        (select Count(*) from repair_record rr
+        inner join repair_evaluate re on re.deleted = 0 and re.star > 3 and re.record_id = rr.id
+        where rr.deleted = 0 and rr.maintenance_state = 7 and find_in_set(ru.id,rr.maintenancer_id)) as evaluate_count
+        from repair_user ru
+        where ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.school_id = #{schoolId}
+    </select>
 </mapper>

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -3,6 +3,7 @@ com\repair\services\impl\RepairShiftSettingsServiceImpl.class
 com\repair\mapper\RepairPayRecordMapper.class
 com\repair\common\utils\AesUtils.class
 com\repair\model\vo\AddressBookVo.class
+com\repair\model\vo\ClassesDataVo.class
 com\repair\api\RepairEvaluateControllerAPI.class
 com\repair\common\utils\ExcelExportUtil.class
 com\repair\core\JwtAuthenticationInterceptor.class
@@ -44,6 +45,7 @@ com\repair\model\vo\AlterPriceShowVo.class
 com\repair\mapper\RepairConsumeMapper.class
 com\repair\model\request\insertRepairConsumeRequest.class
 com\repair\model\vo\ConsumeVo.class
+com\repair\model\vo\PositiveReviewVo.class
 com\repair\services\RepairNoticeSettingService.class
 com\repair\model\request\MobileRevertRequest.class
 com\repair\controller\RepairRecordController.class
@@ -124,7 +126,9 @@ com\repair\services\RepairRecordService.class
 com\repair\controller\RepairConsumeController.class
 com\repair\mapper\RepairLeaveMessageMapper.class
 com\repair\api\RepairCollaborateRecordControllerAPI.class
+com\repair\model\vo\ShiftSettingDataVo.class
 com\repair\model\enumModel\eFileType.class
+com\repair\model\vo\UserScheduleVo.class
 com\repair\model\request\collaborateApplyRequest.class
 com\repair\model\pojo\RepairNoticeSetting.class
 com\repair\config\SmsConfig.class
@@ -143,6 +147,7 @@ com\repair\controller\LoginController$2.class
 com\repair\mapper\RepairAreaMapper.class
 com\repair\model\vo\AddressBookListVo.class
 com\repair\mapper\RepairNoticeSettingMapper.class
+com\repair\model\request\UserScheduleRequest.class
 com\repair\services\RepairShiftSettingsService.class
 com\repair\common\utils\WxUtil.class
 com\repair\model\vo\ClassesSettingPageVo.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -58,8 +58,10 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairRefundRecord.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairConsumablesMapper.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairUserControllerAPI.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesDataVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairLeaveMessageService.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\EvaluateVo.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ShiftSettingDataVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairWorkTypeController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairConsumeRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticeVo.java
@@ -88,6 +90,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairRecordControllerAPI.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairShiftSettingsServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairConsumeService.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\PositiveReviewVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\AlterPriceShowVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\AddressBookVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\DetailsVo.java
@@ -171,6 +174,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UserDataVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairClassesRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairTrackRecordServiceImpl.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UserScheduleVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eWeekStatu.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairManageCountVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairSchool.java
@@ -286,6 +290,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\MaintenanceConsumeablesRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\NoticePageVo.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\RevertRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\UserScheduleRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\BaseResult.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairAdminServiceImpl.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairDispatchRecordService.java