소스 검색

提交合并代码

夏文涛 2 년 전
부모
커밋
16d5ea3be2
97개의 변경된 파일1994개의 추가작업 그리고 2802개의 파일을 삭제
  1. 435 367
      .idea/workspace.xml
  2. 1 1
      src/main/java/com/repair/api/RepairEvaluateControllerAPI.java
  3. 1 1
      src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java
  4. 1 1
      src/main/java/com/repair/api/RepairPayRecordControllerAPI.java
  5. 25 4
      src/main/java/com/repair/api/RepairRecordControllerAPI.java
  6. 9 0
      src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java
  7. 58 17
      src/main/java/com/repair/common/utils/DateUtils.java
  8. 17 2
      src/main/java/com/repair/common/utils/TimeExchange.java
  9. 10 9
      src/main/java/com/repair/controller/RepairClassesSettingsController.java
  10. 13 0
      src/main/java/com/repair/controller/RepairConsumablesController.java
  11. 72 5
      src/main/java/com/repair/controller/RepairEvaluateController.java
  12. 37 7
      src/main/java/com/repair/controller/RepairLeaveMessageController.java
  13. 48 19
      src/main/java/com/repair/controller/RepairPayRecordController.java
  14. 590 44
      src/main/java/com/repair/controller/RepairRecordController.java
  15. 17 1
      src/main/java/com/repair/controller/RepairSystemMessagesController.java
  16. 6 2
      src/main/java/com/repair/mapper/RepairEvaluateMapper.java
  17. 13 1
      src/main/java/com/repair/mapper/RepairRecordMapper.java
  18. 5 0
      src/main/java/com/repair/mapper/RepairSystemMessagesMapper.java
  19. 2 0
      src/main/java/com/repair/mapper/RepairUserMapper.java
  20. 5 0
      src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java
  21. 6 0
      src/main/java/com/repair/model/pojo/RepairRecord.java
  22. 8 0
      src/main/java/com/repair/model/pojo/RepairSystemMessages.java
  23. 4 0
      src/main/java/com/repair/model/pojo/RepairTrackRecord.java
  24. 4 0
      src/main/java/com/repair/model/pojo/RepairTransferRecord.java
  25. 6 0
      src/main/java/com/repair/model/request/collaborateApplyRequest.java
  26. 5 0
      src/main/java/com/repair/model/request/finishOrderRequest.java
  27. 3 0
      src/main/java/com/repair/model/request/repairRecordRequest.java
  28. 8 1
      src/main/java/com/repair/model/request/transferApplyRequest.java
  29. 0 1
      src/main/java/com/repair/model/request/transferRequest.java
  30. 6 0
      src/main/java/com/repair/model/vo/CollaborateDetailVo.java
  31. 22 0
      src/main/java/com/repair/model/vo/MaintenanceGoodsVo.java
  32. 25 0
      src/main/java/com/repair/model/vo/MaintenanceWorkerVo.java
  33. 28 0
      src/main/java/com/repair/model/vo/RecordEvaluateVo.java
  34. 25 0
      src/main/java/com/repair/model/vo/RepairAreaVo.java
  35. 23 0
      src/main/java/com/repair/model/vo/RepairCampusVo.java
  36. 7 0
      src/main/java/com/repair/model/vo/RepairCardNumberVo.java
  37. 19 0
      src/main/java/com/repair/model/vo/RepairRecordPageVo.java
  38. 39 0
      src/main/java/com/repair/model/vo/SystemMessagePageVo.java
  39. 5 0
      src/main/java/com/repair/model/vo/TransferDetailVo.java
  40. 2 0
      src/main/java/com/repair/services/RepairDispatchRecordService.java
  41. 8 1
      src/main/java/com/repair/services/RepairEvaluateService.java
  42. 2 0
      src/main/java/com/repair/services/RepairReceivingService.java
  43. 14 1
      src/main/java/com/repair/services/RepairRecordService.java
  44. 9 0
      src/main/java/com/repair/services/RepairSystemMessagesService.java
  45. 1 0
      src/main/java/com/repair/services/RepairUserService.java
  46. 8 0
      src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java
  47. 24 1
      src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java
  48. 9 0
      src/main/java/com/repair/services/impl/RepairReceivingServiceImpl.java
  49. 37 2
      src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java
  50. 24 1
      src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java
  51. 8 0
      src/main/java/com/repair/services/impl/RepairUserServiceImpl.java
  52. 2 2
      src/main/resources/application-prod.yml
  53. 1 1
      src/main/resources/application.yml
  54. 2 1
      src/main/resources/mapper/repair/RepairCollaborateRecordMapper.xml
  55. 2 1
      src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml
  56. 12 0
      src/main/resources/mapper/repair/RepairEvaluateMapper.xml
  57. 194 3
      src/main/resources/mapper/repair/RepairRecordMapper.xml
  58. 14 0
      src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml
  59. 2 1
      src/main/resources/mapper/repair/RepairTransferRecordMapper.xml
  60. 11 0
      src/main/resources/mapper/repair/RepairUserMapper.xml
  61. 0 72
      target/classes/META-INF/spring-configuration-metadata.json
  62. 0 69
      target/classes/application-dev.yml
  63. 0 70
      target/classes/application-prod.yml
  64. 0 67
      target/classes/application.yml
  65. BIN
      target/classes/excelFile/耗材管理模板.xlsx
  66. BIN
      target/classes/excelFile/自定义排班模板.xlsx
  67. 0 5
      target/classes/mapper/repair/RepairAdminMapper.xml
  68. 0 14
      target/classes/mapper/repair/RepairAreaMapper.xml
  69. 0 36
      target/classes/mapper/repair/RepairArticleTypeMapper.xml
  70. 0 68
      target/classes/mapper/repair/RepairClassesSettingsMapper.xml
  71. 0 5
      target/classes/mapper/repair/RepairCloseMapper.xml
  72. 0 49
      target/classes/mapper/repair/RepairCollaborateRecordMapper.xml
  73. 0 82
      target/classes/mapper/repair/RepairConsumablesMapper.xml
  74. 0 91
      target/classes/mapper/repair/RepairConsumeMapper.xml
  75. 0 20
      target/classes/mapper/repair/RepairDispatchRecordMapper.xml
  76. 0 34
      target/classes/mapper/repair/RepairEvaluateMapper.xml
  77. 0 5
      target/classes/mapper/repair/RepairLeaveMessageMapper.xml
  78. 0 24
      target/classes/mapper/repair/RepairNoticeSettingMapper.xml
  79. 0 19
      target/classes/mapper/repair/RepairPayRecordMapper.xml
  80. 0 5
      target/classes/mapper/repair/RepairReceivingMapper.xml
  81. 0 671
      target/classes/mapper/repair/RepairRecordMapper.xml
  82. 0 5
      target/classes/mapper/repair/RepairRefundRecordMapper.xml
  83. 0 5
      target/classes/mapper/repair/RepairSchoolMapper.xml
  84. 0 5
      target/classes/mapper/repair/RepairShiftSettingsMapper.xml
  85. 0 5
      target/classes/mapper/repair/RepairSystemMessagesMapper.xml
  86. 0 5
      target/classes/mapper/repair/RepairSystemSettingMapper.xml
  87. 0 5
      target/classes/mapper/repair/RepairTrackRecordMapper.xml
  88. 0 16
      target/classes/mapper/repair/RepairTransferRecordMapper.xml
  89. 0 195
      target/classes/mapper/repair/RepairUserMapper.xml
  90. 0 13
      target/classes/mapper/repair/RepairWorkTypeMapper.xml
  91. 0 5
      target/classes/mapper/repair/WxAccessTokenMapper.xml
  92. 0 3
      target/maven-archiver/pom.properties
  93. 0 323
      target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  94. 0 309
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  95. 0 2
      target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  96. 0 2
      target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  97. BIN
      target/repair_system-0.0.1-SNAPSHOT.jar.original

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 435 - 367
.idea/workspace.xml


+ 1 - 1
src/main/java/com/repair/api/RepairEvaluateControllerAPI.java

@@ -17,7 +17,7 @@ public interface RepairEvaluateControllerAPI {
 
 
     @PostMapping(value = "/insertRepairEvaluate")
     @PostMapping(value = "/insertRepairEvaluate")
     @ApiOperation(value = "添加评价", notes = "添加评价数据", httpMethod = "POST")
     @ApiOperation(value = "添加评价", notes = "添加评价数据", httpMethod = "POST")
-    CommonResult InsertRepairEvaluate(@Validated @RequestBody RepairEvaluate repairEvaluate, BindingResult bindingResult);
+    CommonResult InsertRepairEvaluate(@Validated @RequestBody RepairEvaluate repairEvaluate, BindingResult bindingResult) throws Exception;
 
 
     @GetMapping(value = "/queryPageRepairEvaluate")
     @GetMapping(value = "/queryPageRepairEvaluate")
     @ApiOperation(value = "评价分页数据", notes = "评价分页数据", httpMethod = "GET")
     @ApiOperation(value = "评价分页数据", notes = "评价分页数据", httpMethod = "GET")

+ 1 - 1
src/main/java/com/repair/api/RepairLeaveMessageControllerAPI.java

@@ -31,5 +31,5 @@ public interface RepairLeaveMessageControllerAPI {
 
 
     @PostMapping(value = "/transferToLogistics")
     @PostMapping(value = "/transferToLogistics")
     @ApiOperation(value = "转后勤", notes = "转后勤", httpMethod = "POST")
     @ApiOperation(value = "转后勤", notes = "转后勤", httpMethod = "POST")
-    CommonResult transferToLogistics(@Validated @RequestBody repairLeaveMessageRequest rlmr, BindingResult bindingResult);
+    CommonResult transferToLogistics(@Validated @RequestBody repairLeaveMessageRequest rlmr, BindingResult bindingResult) throws Exception;
 }
 }

+ 1 - 1
src/main/java/com/repair/api/RepairPayRecordControllerAPI.java

@@ -40,7 +40,7 @@ public interface RepairPayRecordControllerAPI {
 
 
     @PostMapping(value = "/refundableAmount")
     @PostMapping(value = "/refundableAmount")
     @ApiOperation(value = "实退", notes = "实退", httpMethod = "POST")
     @ApiOperation(value = "实退", notes = "实退", httpMethod = "POST")
-    CommonResult refundableAmount(@RequestBody RefundableAmountRequest rar, BindingResult bindingResult);
+    CommonResult refundableAmount(@RequestBody RefundableAmountRequest rar,@RequestHeader("user_head") String userhead, BindingResult bindingResult);
 
 
 
 
 }
 }

+ 25 - 4
src/main/java/com/repair/api/RepairRecordControllerAPI.java

@@ -40,7 +40,7 @@ public interface RepairRecordControllerAPI {
 
 
     @GetMapping(value = "/revokeRepairRecordById")
     @GetMapping(value = "/revokeRepairRecordById")
     @ApiOperation(value = "根据ID撤销指定报修记录", notes = "根据ID撤销指定报修记录", httpMethod = "GET")
     @ApiOperation(value = "根据ID撤销指定报修记录", notes = "根据ID撤销指定报修记录", httpMethod = "GET")
-    CommonResult revokeRepairRecordById(@RequestParam int id);
+    CommonResult revokeRepairRecordById(@RequestParam int id) throws Exception;
 
 
     @GetMapping(value = "/getRepairRecordsByUserId")
     @GetMapping(value = "/getRepairRecordsByUserId")
     @ApiOperation(value = "根据用户ID获取报修记录", notes = "根据用户ID获取报修记录", httpMethod = "GET")
     @ApiOperation(value = "根据用户ID获取报修记录", notes = "根据用户ID获取报修记录", httpMethod = "GET")
@@ -72,7 +72,7 @@ public interface RepairRecordControllerAPI {
 
 
     @GetMapping(value = "/queryPendingOrder")
     @GetMapping(value = "/queryPendingOrder")
     @ApiOperation(value = "待处理池分页数据", notes = "待处理池分页数据", httpMethod = "GET")
     @ApiOperation(value = "待处理池分页数据", notes = "待处理池分页数据", httpMethod = "GET")
-    CommonResult queryPendingOrder(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam int userId);
+    CommonResult queryPendingOrder(@RequestParam int currentPage, @RequestParam int pageCount);
 
 
     @GetMapping(value = "/receiveOrders")
     @GetMapping(value = "/receiveOrders")
     @ApiOperation(value = "待处理池接单", notes = "待处理池接单", httpMethod = "GET")
     @ApiOperation(value = "待处理池接单", notes = "待处理池接单", httpMethod = "GET")
@@ -84,7 +84,7 @@ public interface RepairRecordControllerAPI {
 
 
     @GetMapping(value = "/closeOrder")
     @GetMapping(value = "/closeOrder")
     @ApiOperation(value = "关单", notes = "关单", httpMethod = "GET")
     @ApiOperation(value = "关单", notes = "关单", httpMethod = "GET")
-    CommonResult closeOrders(@RequestParam int recordId, @RequestParam String userId, @RequestParam String reason);
+    CommonResult closeOrders(@RequestParam int recordId, @RequestParam String userId, @RequestParam String reason) throws Exception;
 
 
     @PostMapping(value = "/finishOrder")
     @PostMapping(value = "/finishOrder")
     @ApiOperation(value = "维修完成", notes = "维修完成", httpMethod = "POST")
     @ApiOperation(value = "维修完成", notes = "维修完成", httpMethod = "POST")
@@ -112,7 +112,7 @@ public interface RepairRecordControllerAPI {
 
 
     @GetMapping(value = "/dropDown")
     @GetMapping(value = "/dropDown")
     @ApiOperation(value = "下拉框", notes = "下拉框", httpMethod = "GET")
     @ApiOperation(value = "下拉框", notes = "下拉框", httpMethod = "GET")
-    CommonResult dropDown() throws Exception;
+    CommonResult dropDown(@RequestParam Integer recordId) throws Exception;
 
 
     @GetMapping(value = "/details")
     @GetMapping(value = "/details")
     @ApiOperation(value = "详情", notes = "详情", httpMethod = "GET")
     @ApiOperation(value = "详情", notes = "详情", httpMethod = "GET")
@@ -173,4 +173,25 @@ public interface RepairRecordControllerAPI {
     @GetMapping(value = "/queryLogisticHomeCount")
     @GetMapping(value = "/queryLogisticHomeCount")
     @ApiOperation(value = "郭师傅和后勤首页头部数量", notes = "郭师傅和后勤首页头部数量", httpMethod = "GET")
     @ApiOperation(value = "郭师傅和后勤首页头部数量", notes = "郭师傅和后勤首页头部数量", httpMethod = "GET")
     CommonResult queryLogisticHomeCount(@RequestParam int schoolId);
     CommonResult queryLogisticHomeCount(@RequestParam int schoolId);
+
+    @GetMapping(value = "/repairCampus")
+    @ApiOperation(value = "报修校区统计", notes = "报修校区统计", httpMethod = "GET")
+    CommonResult repairCampus(@RequestParam int state) throws Exception;
+
+    @GetMapping(value = "/repairArea")
+    @ApiOperation(value = "报修区域统计", notes = "报修区域统计", httpMethod = "GET")
+    CommonResult repairArea(@RequestParam int state) throws Exception;
+
+    @GetMapping(value = "/maintenanceGoods")
+    @ApiOperation(value = "维修物品统计", notes = "维修物品统计", httpMethod = "GET")
+    CommonResult maintenanceGoods(@RequestParam int state) throws Exception;
+
+    @GetMapping(value = "/maintenanceWorker")
+    @ApiOperation(value = "维修师傅效率统计", notes = "维修师傅效率统计", httpMethod = "GET")
+    CommonResult maintenanceWorker(@RequestParam int state) throws Exception;
+
+    @GetMapping(value = "/repairAnalysis")
+    @ApiOperation(value = "报修分析统计", notes = "报修分析统计", httpMethod = "GET")
+    CommonResult repairAnalysis(@RequestParam int state) throws Exception;
+	
 }
 }

+ 9 - 0
src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java

@@ -27,4 +27,13 @@ public interface RepairSystemMessagesControllerAPI {
     @GetMapping(value = "/deleterepairSystemMessagesById")
     @GetMapping(value = "/deleterepairSystemMessagesById")
     @ApiOperation(value = "根据ID删除指定系统信息", notes = "根据ID删除指定系统信息", httpMethod = "GET")
     @ApiOperation(value = "根据ID删除指定系统信息", notes = "根据ID删除指定系统信息", httpMethod = "GET")
     CommonResult deleterepairSystemMessagesById(@RequestParam int id);
     CommonResult deleterepairSystemMessagesById(@RequestParam int id);
+
+    @GetMapping(value = "/querySystemMessagePage")
+    @ApiOperation(value = "消息中心", notes = "消息中心", httpMethod = "GET")
+    CommonResult querySystemMessagePage(@RequestParam int currentPage, @RequestParam int pageCount,  @RequestParam int userId);
+
+    @GetMapping(value = "/readSystemMessage")
+    @ApiOperation(value = "已读操作", notes = "已读操作", httpMethod = "GET")
+    CommonResult readSystemMessage(@RequestParam int id);
+
 }
 }

+ 58 - 17
src/main/java/com/repair/common/utils/DateUtils.java

@@ -8,23 +8,64 @@ import java.util.Date;
 
 
 public class DateUtils {
 public class DateUtils {
 
 
-//    计算时差
-   public static String difference(Date start,Date end){
-       SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-       String time1 = sdf.format(start);
-       String time2 = sdf.format(end);
-
-       DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-       LocalDateTime dateTime1 = LocalDateTime.parse(time1, formatter);
-       LocalDateTime dateTime2 = LocalDateTime.parse(time2, formatter);
-       Duration duration = Duration.between(dateTime1, dateTime2);
-
-       long days = duration.toDays();
-       long hours = duration.toHours() % 24;
-       long minutes = duration.toMinutes() % 60;
-       long seconds = duration.getSeconds() % 60;
+    //    计算时差
+    public static String difference(Date start, Date end) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String time1 = sdf.format(start);
+        String time2 = sdf.format(end);
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime dateTime1 = LocalDateTime.parse(time1, formatter);
+        LocalDateTime dateTime2 = LocalDateTime.parse(time2, formatter);
+        Duration duration = Duration.between(dateTime1, dateTime2);
+
+        long days = duration.toDays();
+        long hours = duration.toHours() % 24;
+        long minutes = duration.toMinutes() % 60;
+        long seconds = duration.getSeconds() % 60;
 //       System.out.println("时间差为:" + days + "天 " + hours + "小时 " + minutes + "分钟 " + seconds + "秒");
 //       System.out.println("时间差为:" + days + "天 " + hours + "小时 " + minutes + "分钟 " + seconds + "秒");
-       return days + "天 " + hours + "小时 " + minutes + "分钟 " + seconds + "秒";
-   }
+        return days + "天 " + hours + "小时 " + minutes + "分钟 " + seconds + "秒";
+    }
+
+
+
+
+    public static String startTime(Integer state) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        LocalDateTime now = LocalDateTime.now();
+
+        switch (state) {
+//           本年
+            case 1:
+                LocalDateTime localDateTime = now.minusYears(1);
+                return localDateTime.format(dateTimeFormatter);
+//           本月
+            case 2:
+                LocalDateTime localDateTime1 = now.minusMonths(1);
+                return localDateTime1.format(dateTimeFormatter);
+
+//            本周
+            case 3:
+                LocalDateTime localDateTime2 = now.minusWeeks(1);
+                return localDateTime2.format(dateTimeFormatter);
+
+//            今天
+            case 4:
+                LocalDateTime localDateTime3 = now.minusDays(1);
+                return localDateTime3.format(dateTimeFormatter);
+        }
 
 
+        return null;
+    }
+    public static String endTime(){
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.now().format(dateTimeFormatter);
+    }
+    public static void main(String[] args) {
+        String s = startTime(4);
+        System.out.println("s = " + s);
+        String s1 = endTime();
+        System.out.println("s1 = " + s1);
+    }
 }
 }

+ 17 - 2
src/main/java/com/repair/common/utils/TimeExchange.java

@@ -298,13 +298,28 @@ public class TimeExchange {
      * @return
      * @return
      * @throws ParseException
      * @throws ParseException
      */
      */
-    public static String TimeRangeI(String time, int amount, String FormatStr) throws ParseException {
+    public static String TimeRangeMinute(String time, int amount, String FormatStr) throws ParseException {
         Date endTime = DateUtils.addMinutes(ShortStringToDate(time, FormatStr), amount);
         Date endTime = DateUtils.addMinutes(ShortStringToDate(time, FormatStr), amount);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(FormatStr);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(FormatStr);
         return simpleDateFormat.format(endTime);
         return simpleDateFormat.format(endTime);
     }
     }
 
 
     /**
     /**
+     * 时间减去小时数
+     *
+     * @param time      时间
+     * @param FormatStr 时间格式
+     * @param amount    要加减的时间(单位为小时)
+     * @return
+     * @throws ParseException
+     */
+    public static String TimeRangeHour(Date time, int amount, String FormatStr) {
+        Date endTime = DateUtils.addHours(time, amount);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(FormatStr);
+        return simpleDateFormat.format(endTime);
+    }
+
+    /**
      * String 转 Date
      * String 转 Date
      *
      *
      * @param time      时间
      * @param time      时间
@@ -632,6 +647,7 @@ public class TimeExchange {
 //        LocalDateTime start1 = StringToLocalTime("13:00","HH:mm");
 //        LocalDateTime start1 = StringToLocalTime("13:00","HH:mm");
 //        LocalDateTime end1 = StringToLocalTime("15:00","HH:mm");
 //        LocalDateTime end1 = StringToLocalTime("15:00","HH:mm");
 
 
+        String dateSre = TimeRangeHour(new Date(), -24,"yyyy-MM-dd HH:mm:ss");
         List<Integer> newDatas = new ArrayList<>();
         List<Integer> newDatas = new ArrayList<>();
         newDatas.add(1);
         newDatas.add(1);
         newDatas.add(3);
         newDatas.add(3);
@@ -642,7 +658,6 @@ public class TimeExchange {
         oldDatas.add(0);
         oldDatas.add(0);
         oldDatas.add(3);
         oldDatas.add(3);
         List<Integer> finall = newDatas.stream().filter(item -> !oldDatas.contains(item)).collect(Collectors.toList());
         List<Integer> finall = newDatas.stream().filter(item -> !oldDatas.contains(item)).collect(Collectors.toList());
-
         String sss = "";
         String sss = "";
     }
     }
 }
 }

+ 10 - 9
src/main/java/com/repair/controller/RepairClassesSettingsController.java

@@ -305,15 +305,9 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
                 }
                 }
             }
             }
 
 
-            RepairClassesSettings rcs = new RepairClassesSettings();
             //为空则新增排班数据
             //为空则新增排班数据
             if (usv.getClassId() == null) {
             if (usv.getClassId() == null) {
-                //判断对应师傅当天排班数据是否存在
-                ClassesDataVo csv = repairClassesSettingsService.queryClassesData(usv.getId());
-                if (csv != null) {
-                    return CommonResult.fail("排班数据已存在,新增失败");
-                }
-
+                RepairClassesSettings rcs = new RepairClassesSettings();
                 rcs.setUserId(usv.getId());
                 rcs.setUserId(usv.getId());
                 Date date = new Date();
                 Date date = new Date();
                 Instant instant = date.toInstant();
                 Instant instant = date.toInstant();
@@ -328,8 +322,15 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
                     return CommonResult.fail("排班信息新增失败");
                     return CommonResult.fail("排班信息新增失败");
                 }
                 }
             } else {
             } else {
-                rcs.setShiftId(StringUtils.join(shifts, ","));
-                int updateClasses = repairClassesSettingsService.updateRepairClassesSettings(rcs);
+                //判断对应师傅当天排班数据是否存在
+                RepairClassesSettings csv = repairClassesSettingsService.getRepairById(usv.getClassId());
+
+                if(csv == null){
+                    return CommonResult.fail("排班数据不存在更新失败");
+                }
+
+                csv.setShiftId(StringUtils.join(shifts, ","));
+                int updateClasses = repairClassesSettingsService.updateRepairClassesSettings(csv);
                 if (updateClasses <= 0) {
                 if (updateClasses <= 0) {
                     return CommonResult.fail("排班信息更新失败");
                     return CommonResult.fail("排班信息更新失败");
                 }
                 }

+ 13 - 0
src/main/java/com/repair/controller/RepairConsumablesController.java

@@ -9,6 +9,7 @@ import com.repair.common.utils.paramUtils;
 import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.RepairConsumables;
 import com.repair.model.pojo.RepairConsumables;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.pojo.RepairRecord;
+import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.request.insertConsumablesRequest;
 import com.repair.model.request.insertConsumablesRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.result.PageUtils;
@@ -18,6 +19,7 @@ import com.repair.model.vo.ConsumableExcelVo;
 import com.repair.model.vo.ConsumablePageVo;
 import com.repair.model.vo.ConsumablePageVo;
 import com.repair.services.RepairConsumablesService;
 import com.repair.services.RepairConsumablesService;
 import com.repair.services.RepairRecordService;
 import com.repair.services.RepairRecordService;
+import com.repair.services.RepairSystemMessagesService;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,6 +52,8 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
     private RepairConsumablesService repairConsumablesService;
     private RepairConsumablesService repairConsumablesService;
     @Autowired
     @Autowired
     private RepairRecordService repairRecordService;
     private RepairRecordService repairRecordService;
+    @Autowired
+    private RepairSystemMessagesService repairSystemMessagesService;
 
 
     @Override
     @Override
     public CommonResult InsertrepairConsumables(RepairConsumables rc, BindingResult bindingResult) {
     public CommonResult InsertrepairConsumables(RepairConsumables rc, BindingResult bindingResult) {
@@ -209,6 +213,15 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             if (updateRecord <= 0) {
             if (updateRecord <= 0) {
                 throw new Exception("报价失败!");
                 throw new Exception("报价失败!");
             }
             }
+
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setRecordId(data.getRecordId());
+            rsm.setRecipientId(rr.getUserId());
+            rsm.setContent("工单需要支付"+data.getTotalPrice()+"元,请尽快确认!");
+            int insertRsm =repairSystemMessagesService.insertRepairSystemMessages(rsm);
+            if(insertRsm <= 0){
+                throw new Exception("报修单提交失败!");
+            }
         } catch (Exception e) {
         } catch (Exception e) {
             throw new Exception("报价失败!");
             throw new Exception("报价失败!");
         }
         }

+ 72 - 5
src/main/java/com/repair/controller/RepairEvaluateController.java

@@ -5,13 +5,19 @@ import com.alibaba.excel.EasyExcel;
 import com.repair.api.RepairEvaluateControllerAPI;
 import com.repair.api.RepairEvaluateControllerAPI;
 import com.repair.common.utils.ExcelUtils;
 import com.repair.common.utils.ExcelUtils;
 import com.repair.common.utils.paramUtils;
 import com.repair.common.utils.paramUtils;
+import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.RepairEvaluate;
 import com.repair.model.pojo.RepairEvaluate;
+import com.repair.model.pojo.RepairRecord;
+import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.EvaluateVo;
 import com.repair.model.vo.EvaluateVo;
 import com.repair.services.RepairEvaluateService;
 import com.repair.services.RepairEvaluateService;
+import com.repair.services.RepairRecordService;
+import com.repair.services.RepairSystemMessagesService;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
@@ -36,17 +43,77 @@ import java.util.List;
 public class RepairEvaluateController implements RepairEvaluateControllerAPI {
 public class RepairEvaluateController implements RepairEvaluateControllerAPI {
 
 
     @Autowired
     @Autowired
+    private RepairRecordService repairRecordService;
+    @Autowired
     private RepairEvaluateService repairEvaluateService;
     private RepairEvaluateService repairEvaluateService;
+    @Autowired
+    private RepairSystemMessagesService repairSystemMessagesService;
 
 
     @Override
     @Override
-    public CommonResult InsertRepairEvaluate(@RequestBody RepairEvaluate repairEvaluate, BindingResult bindingResult) {
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult InsertRepairEvaluate(@RequestBody RepairEvaluate repairEvaluate, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
             return CommonResult.fail(st);
         }
         }
-        int result = repairEvaluateService.insertRepairEvaluate(repairEvaluate);// 帮我们自动生成id
 
 
-        return result > 0 ? CommonResult.ok() : CommonResult.fail();
+        if(repairEvaluate.getStar() > 5){
+            return CommonResult.fail("评价星级最多五颗星");
+        }
+
+        if(repairEvaluate.getStar() < 1){
+            return CommonResult.fail("评价星级最低一颗星");
+        }
+
+        RepairRecord rr = repairRecordService.getRepairById(repairEvaluate.getRecordId());
+        if (rr == null) {
+            return CommonResult.fail("维修单已失效,评价失败!");
+        }
+
+        if (rr.getMaintenanceState() != eRecordStatu.Finished.getValue()) {
+            return CommonResult.fail("已完成订单才能进行评价操作!");
+        }
+
+        RepairEvaluate re = repairEvaluateService.getRepairByRecordId(rr.getId());
+        if(re != null){
+            return CommonResult.fail("该订单已评价,请勿重复操作!");
+        }
+
+        try {
+            int result = repairEvaluateService.insertRepairEvaluate(repairEvaluate);// 帮我们自动生成id
+            if (result <= 0) {
+                throw new Exception("评价失败!");
+            }
+            String[] mUserIds = rr.getMaintenancerId().split(",");
+            List<RepairSystemMessages> rsms = new ArrayList<>();
+            for (int i = 0; i < mUserIds.length; i++) {
+                RepairSystemMessages rsm = new RepairSystemMessages();
+                rsm.setIsRead(0);
+                rsm.setRecordId(result);
+                rsm.setRecipientId(Integer.valueOf(mUserIds[i]));
+                rsm.setContent("用户已点评!");
+                rsms.add(rsm);
+            }
+            //用户的
+            //感谢您的点评,非常感谢您对我们的认可及支持。
+            RepairSystemMessages rsmU = new RepairSystemMessages();
+            rsmU.setIsRead(0);
+            rsmU.setRecordId(result);
+            rsmU.setRecipientId(rr.getUserId());
+            rsmU.setContent("感谢您的点评,非常感谢您对我们的认可及支持。");
+            rsms.add(rsmU);
+            if (rsms.size() > 0) {
+                boolean insertRsm = repairSystemMessagesService.inserBatchSystemMessage(rsms);
+                if (!insertRsm) {
+                    throw new Exception("评价失败!");
+                }
+            }
+
+        } catch (Exception e) {
+            throw new Exception("评价失败!");
+        }
+
+        return CommonResult.ok("评价成功");
     }
     }
 
 
     @Override
     @Override
@@ -58,7 +125,7 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
 
 
     @Override
     @Override
     public CommonResult deleteRepairEvaluateById(int id) {
     public CommonResult deleteRepairEvaluateById(int id) {
-        RepairEvaluate data = repairEvaluateService.getRepairById(String.valueOf(id));
+        RepairEvaluate data = repairEvaluateService.getRepairById(id);
         if (data == null) {
         if (data == null) {
             return CommonResult.fail("当前数据不存在,删除失败!");
             return CommonResult.fail("当前数据不存在,删除失败!");
         }
         }
@@ -69,7 +136,7 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
     }
     }
 
 
     @Override
     @Override
-    public void toRepairEvaluateExcel(HttpServletResponse response,String keyWord, String startTime, String endTime) {
+    public void toRepairEvaluateExcel(HttpServletResponse response, String keyWord, String startTime, String endTime) {
         List<EvaluateVo> result = repairEvaluateService.queryEvaluateList(keyWord, startTime, endTime);
         List<EvaluateVo> result = repairEvaluateService.queryEvaluateList(keyWord, startTime, endTime);
 
 
         String sheelName = "评价信息";
         String sheelName = "评价信息";

+ 37 - 7
src/main/java/com/repair/controller/RepairLeaveMessageController.java

@@ -6,14 +6,17 @@ import com.repair.common.utils.paramUtils;
 import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.RepairLeaveMessage;
 import com.repair.model.pojo.RepairLeaveMessage;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.pojo.RepairRecord;
+import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.request.repairLeaveMessageRequest;
 import com.repair.model.request.repairLeaveMessageRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.RepairLogisticsVo;
 import com.repair.model.vo.RepairLogisticsVo;
 import com.repair.services.RepairLeaveMessageService;
 import com.repair.services.RepairLeaveMessageService;
 import com.repair.services.RepairRecordService;
 import com.repair.services.RepairRecordService;
+import com.repair.services.RepairSystemMessagesService;
 import com.repair.services.RepairUserService;
 import com.repair.services.RepairUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;
 
 
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -33,6 +36,8 @@ import java.util.List;
 public class RepairLeaveMessageController implements RepairLeaveMessageControllerAPI {
 public class RepairLeaveMessageController implements RepairLeaveMessageControllerAPI {
 
 
     @Autowired
     @Autowired
+    private RepairSystemMessagesService repairSystemMessagesService;
+    @Autowired
     private RepairLeaveMessageService repairLeaveMessageService;
     private RepairLeaveMessageService repairLeaveMessageService;
     @Autowired
     @Autowired
     private RepairRecordService repairRecordService;
     private RepairRecordService repairRecordService;
@@ -84,7 +89,8 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
     }
     }
 
 
     @Override
     @Override
-    public CommonResult transferToLogistics(repairLeaveMessageRequest rlmr, BindingResult bindingResult) {
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult transferToLogistics(repairLeaveMessageRequest rlmr, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
             return CommonResult.fail(st);
@@ -110,6 +116,7 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
 
 
         //有可能有多个后勤
         //有可能有多个后勤
         List<RepairLeaveMessage> datas = new ArrayList<>();
         List<RepairLeaveMessage> datas = new ArrayList<>();
+        List<RepairSystemMessages> messages = new ArrayList<>();
         for (RepairLogisticsVo u : users) {
         for (RepairLogisticsVo u : users) {
             RepairLeaveMessage data = new RepairLeaveMessage();
             RepairLeaveMessage data = new RepairLeaveMessage();
             data.setSenderId(rlmr.getUserId());
             data.setSenderId(rlmr.getUserId());
@@ -117,17 +124,40 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
             data.setContent(rlmr.getContent());
             data.setContent(rlmr.getContent());
             data.setRecordId(rlmr.getRecordId());
             data.setRecordId(rlmr.getRecordId());
             datas.add(data);
             datas.add(data);
+
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setIsRead(0);
+            rsm.setRecordId(rlmr.getUserId());
+            rsm.setRecipientId(u.getId());
+            rsm.setContent("用户已提交留言,请尽快处理!");
+            messages.add(rsm);
         }
         }
 
 
-        boolean result = repairLeaveMessageService.inserBatchLeaveMessage(datas);
+        try{
+            boolean result = repairLeaveMessageService.inserBatchLeaveMessage(datas);
+
+            if(!result){
+                throw new Exception("转后勤失败!");
+            }
+            //将工单状态更改为待处理
+            rr.setId(rlmr.getRecordId());
+            rr.setMaintenanceState(eRecordStatu.ToLogistics.getValue());
 
 
-        //将工单状态更改为待处理
-        rr.setId(rlmr.getRecordId());
-        rr.setMaintenanceState(eRecordStatu.ToLogistics.getValue());
+            int updateR = repairRecordService.updateRepairRecord(rr);
+            if(updateR <= 0){
+                throw new Exception("转后勤失败!");
+            }
 
 
-        repairRecordService.updateRepairRecord(rr);
 
 
-        return result ? CommonResult.ok("操作成功") : CommonResult.fail("操作失败");
+            boolean insertRsm =repairSystemMessagesService.inserBatchSystemMessage(messages);
+            if(!insertRsm){
+                throw new Exception("报修单提交失败!");
+            }
+        }catch (Exception e){
+            throw new Exception("转后勤失败!");
+        }
+
+        return CommonResult.ok("转后勤成功");
     }
     }
 }
 }
 
 

+ 48 - 19
src/main/java/com/repair/controller/RepairPayRecordController.java

@@ -3,29 +3,26 @@ package com.repair.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.repair.api.RepairPayRecordControllerAPI;
 import com.repair.api.RepairPayRecordControllerAPI;
+import com.repair.common.utils.AesUtils;
 import com.repair.common.utils.TimeExchange;
 import com.repair.common.utils.TimeExchange;
 import com.repair.common.utils.UUIDUtils;
 import com.repair.common.utils.UUIDUtils;
 import com.repair.common.utils.paramUtils;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.enumModel.eIsSuccess;
 import com.repair.model.enumModel.eIsSuccess;
+import com.repair.model.enumModel.eIsSuper;
 import com.repair.model.enumModel.ePayPageStatu;
 import com.repair.model.enumModel.ePayPageStatu;
 import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.enumModel.eRecordStatu;
-import com.repair.model.pojo.RepairPayRecord;
-import com.repair.model.pojo.RepairRecord;
-import com.repair.model.pojo.RepairRefundRecord;
-import com.repair.model.pojo.RepairUser;
+import com.repair.model.pojo.*;
 import com.repair.model.request.RefundableAmountRequest;
 import com.repair.model.request.RefundableAmountRequest;
 import com.repair.model.request.repairPayRequest;
 import com.repair.model.request.repairPayRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.ProsperityRepairPayRecordsVo;
 import com.repair.model.vo.ProsperityRepairPayRecordsVo;
-import com.repair.services.RepairPayRecordService;
-import com.repair.services.RepairRecordService;
-import com.repair.services.RepairRefundRecordService;
-import com.repair.services.RepairUserService;
+import com.repair.services.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,13 +52,17 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
     private RepairRecordService repairRecordService;
     private RepairRecordService repairRecordService;
     @Autowired
     @Autowired
     private RepairPayRecordService repairPayRecordService;
     private RepairPayRecordService repairPayRecordService;
-
+    @Autowired
+    private RepairSystemMessagesService repairSystemMessagesService;
     @Autowired
     @Autowired
     private RepairUserService repairUserService;
     private RepairUserService repairUserService;
 
 
     @Autowired
     @Autowired
     private RepairRefundRecordService repairRefundRecordService;
     private RepairRefundRecordService repairRefundRecordService;
 
 
+    @Autowired
+    private RepairAdminService repairAdminService;
+
     @Override
     @Override
     public CommonResult InsertrepairPayRecord(RepairPayRecord rc, BindingResult bindingResult) {
     public CommonResult InsertrepairPayRecord(RepairPayRecord rc, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
         if (bindingResult.hasErrors()) {
@@ -160,14 +161,14 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
     public String notifyPay(String orderDate, String orderNo, String amount, String jylsh, String tranStat, String return_type, String sign) throws Exception {
     public String notifyPay(String orderDate, String orderNo, String amount, String jylsh, String tranStat, String return_type, String sign) throws Exception {
 
 
         try {
         try {
-//            除去sign参数外,通知接口各参数皆是待签名参数。按照参数列表顺序,以“key=value&key1=value1”方式生成待签名字符串,再拼接密钥。进行MD5运算生成签名。
-//            示例:
-//            密钥:key=umz4aea6g97skeect0jtxigvjkrimd0o
-//            待签名字符串:
-//            orderDate=20140319163131&orderNo=1403190004&amount=10.00&jylsh=1303190000001&tranStat=1&return_type=1
-//            报文:
-//            orderDate=20140319163131&orderNo=1403190004&amount=10.00&jylsh=1303190000001&tranStat=1&return_type=1umz4aea6g97skeect0jtxigvjkrimd0o
-//            签名:3c797055ef08c16f296d1c28b696f301
+            // 除去sign参数外,通知接口各参数皆是待签名参数。按照参数列表顺序,以“key=value&key1=value1”方式生成待签名字符串,再拼接密钥。进行MD5运算生成签名。
+            // 示例:
+            // 密钥:key=umz4aea6g97skeect0jtxigvjkrimd0o
+            // 待签名字符串:
+            // orderDate=20140319163131&orderNo=1403190004&amount=10.00&jylsh=1303190000001&tranStat=1&return_type=1
+            // 报文:
+            // orderDate=20140319163131&orderNo=1403190004&amount=10.00&jylsh=1303190000001&tranStat=1&return_type=1umz4aea6g97skeect0jtxigvjkrimd0o
+            // 签名:3c797055ef08c16f296d1c28b696f301
 
 
             RepairPayRecord data = repairPayRecordService.queryPaymentData(orderNo);
             RepairPayRecord data = repairPayRecordService.queryPaymentData(orderNo);
 
 
@@ -215,6 +216,23 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
                 if (rrData <= 0) {
                 if (rrData <= 0) {
                     throw new Exception("支付回调失败!");
                     throw new Exception("支付回调失败!");
                 }
                 }
+                //将支付成功消息发送给师傅
+                String[] userIds = rr.getMaintenancerId().split(",");
+                if(userIds.length > 0){
+                    List<RepairSystemMessages> rsms = new ArrayList<>();
+                    for (int i = 0;i<userIds.length;i++){
+                        RepairSystemMessages rsm = new RepairSystemMessages();
+                        rsm.setIsRead(0);
+                        rsm.setRecordId(data.getId());
+                        rsm.setRecipientId(Integer.valueOf(userIds[i]));
+                        rsm.setContent("用户已支付,请尽快处理!");
+                        rsms.add(rsm);
+                    }
+                    boolean insertRsm =repairSystemMessagesService.inserBatchSystemMessage(rsms);
+                    if(!insertRsm){
+                        throw new Exception("支付回调失败!");
+                    }
+                }
             }
             }
 
 
         } catch (Exception e) {
         } catch (Exception e) {
@@ -262,12 +280,15 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
             list.forEach(repairUser -> {
             list.forEach(repairUser -> {
                 userIdList.add(repairUser.getId());
                 userIdList.add(repairUser.getId());
             });
             });
+        }else {
+            userIdList.add(0);
         }
         }
 
 
 
 
         LambdaQueryWrapper<RepairPayRecord> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<RepairPayRecord> wrapper = new LambdaQueryWrapper<>();
 
 
-        wrapper.in(ObjectUtils.isNotEmpty(keyWord) && userIdList.size() > 0, RepairPayRecord::getUserId, userIdList)
+
+        wrapper.in(ObjectUtils.isNotEmpty(keyWord), RepairPayRecord::getUserId, userIdList)
                 .between(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime), RepairPayRecord::getCreateTime, startTime, endTime)
                 .between(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime), RepairPayRecord::getCreateTime, startTime, endTime)
                 .eq(RepairPayRecord::getIsSuccess, eIsSuccess.Succeed.getValue())
                 .eq(RepairPayRecord::getIsSuccess, eIsSuccess.Succeed.getValue())
                 .or()
                 .or()
@@ -376,11 +397,19 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public CommonResult refundableAmount(RefundableAmountRequest rar, BindingResult bindingResult) {
+    public CommonResult refundableAmount(RefundableAmountRequest rar, String userhead, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
             return CommonResult.fail(st);
         }
         }
+//        超级管理员才有实退权限
+        String userID = AesUtils.decrypt(userhead);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        if (operateData == null && eIsSuper.Super.getValue() == operateData.getIsSuper()) {
+            return CommonResult.fail("操作人权限不足,无法使用实退功能!");
+        }
+
+
 //      支付订单ID
 //      支付订单ID
         Integer repairPayRecordId = rar.getRepairPayRecordId();
         Integer repairPayRecordId = rar.getRepairPayRecordId();
 //      总金额
 //      总金额

+ 590 - 44
src/main/java/com/repair/controller/RepairRecordController.java

@@ -1,6 +1,7 @@
 package com.repair.controller;
 package com.repair.controller;
 
 
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.jcraft.jsch.*;
 import com.jcraft.jsch.*;
@@ -65,6 +66,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     @Autowired
     @Autowired
     private RepairDispatchRecordService repairDispatchRecordService;
     private RepairDispatchRecordService repairDispatchRecordService;
     @Autowired
     @Autowired
+    private RepairSystemMessagesService repairSystemMessagesService;
+    @Autowired
     private RepairCollaborateRecordService repairCollaborateRecordService;
     private RepairCollaborateRecordService repairCollaborateRecordService;
     @Autowired
     @Autowired
     private RepairArticleTypeService repairArticleTypeService;
     private RepairArticleTypeService repairArticleTypeService;
@@ -74,7 +77,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     private RepairConsumeService repairConsumeService;
     private RepairConsumeService repairConsumeService;
     @Autowired
     @Autowired
     private RepairAdminService repairAdminService;
     private RepairAdminService repairAdminService;
-
+    @Autowired
+    private RepairEvaluateService repairEvaluateService;
+    @Autowired
+    private  RepairSchoolService repairSchoolService;
     @Autowired
     @Autowired
     private WeiXiaoUtil weiXiaoUtil;
     private WeiXiaoUtil weiXiaoUtil;
 
 
@@ -101,6 +107,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             rr.setDescription(rrr.getDescription());
             rr.setDescription(rrr.getDescription());
             rr.setImage(StringUtils.join(rrr.getImages(), ','));
             rr.setImage(StringUtils.join(rrr.getImages(), ','));
             rr.setVoice(rrr.getVoice());
             rr.setVoice(rrr.getVoice());
+            rr.setVoiceLength(rrr.getVoiceLength());
             rr.setUserId(rrr.getUserId());
             rr.setUserId(rrr.getUserId());
             rr.setUserName(rrr.getUserName());
             rr.setUserName(rrr.getUserName());
             rr.setUserPhone(rrr.getUserPhone());
             rr.setUserPhone(rrr.getUserPhone());
@@ -183,6 +190,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                         rdr.setAcceptanceAssessTime(acceptanceAssessTime);
                         rdr.setAcceptanceAssessTime(acceptanceAssessTime);
                         rdr.setOrderType(0);
                         rdr.setOrderType(0);
                         rdr.setIsLoseEfficacy(0);
                         rdr.setIsLoseEfficacy(0);
+                        rdr.setUsersId(user.getId());
                         break;
                         break;
                     }
                     }
 
 
@@ -198,15 +206,48 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 throw new Exception("报修单提交失败!");
                 throw new Exception("报修单提交失败!");
             }
             }
 
 
+            //两种情况:
+            //1、工单已提交(没找到被派单师傅)
+            //工单已生成,将尽快为您派单。
+            //2、工单待接单(找到了被派单)
+            //工单已交给系统,系统将催促师傅师尽快接单。
             if (rdr != null) {
             if (rdr != null) {
                 rdr.setRecordId(result);
                 rdr.setRecordId(result);
-                rdr.setUsersId(rrr.getUserId());
+
                 int dispatch = repairDispatchRecordService.insertRepairDispatchRecord(rdr);
                 int dispatch = repairDispatchRecordService.insertRepairDispatchRecord(rdr);
                 if (dispatch <= 0) {
                 if (dispatch <= 0) {
                     throw new Exception("报修单提交失败!");
                     throw new Exception("报修单提交失败!");
                 }
                 }
+                List<RepairSystemMessages> rsms = new ArrayList<>();
+                RepairSystemMessages rsm = new RepairSystemMessages();
+                rsm.setIsRead(0);
+                rsm.setRecordId(result);
+                rsm.setRecipientId(rdr.getUsersId());
+                rsm.setContent("用户提交工单,请尽快处理!");
+                rsms.add(rsm);
+                RepairSystemMessages rsm1 = new RepairSystemMessages();
+                rsm1.setIsRead(0);
+                rsm1.setRecordId(result);
+                rsm1.setRecipientId(rrr.getUserId());
+                rsm1.setContent("工单已交给系统,系统将催促师傅师尽快接单!");
+                rsms.add(rsm1);
+                boolean insertRsm = repairSystemMessagesService.inserBatchSystemMessage(rsms);
+                if (!insertRsm) {
+                    throw new Exception("报修单提交失败!");
+                }
+            } else {
+                RepairSystemMessages rsm = new RepairSystemMessages();
+                rsm.setIsRead(0);
+                rsm.setRecordId(result);
+                rsm.setRecipientId(rrr.getUserId());
+                rsm.setContent("工单已生成,将尽快为您派单!");
+                int insertRsm = repairSystemMessagesService.insertRepairSystemMessages(rsm);
+                if (insertRsm <= 0) {
+                    throw new Exception("报修单提交失败!");
+                }
             }
             }
 
 
+
         } catch (Exception e) {
         } catch (Exception e) {
             throw new Exception("报修单提交失败!");
             throw new Exception("报修单提交失败!");
         }
         }
@@ -304,19 +345,65 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
     }
 
 
     @Override
     @Override
-    public CommonResult revokeRepairRecordById(int id) {
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult revokeRepairRecordById(int id) throws Exception {
         RepairRecord data = repairRecordService.getRepairById(id);
         RepairRecord data = repairRecordService.getRepairById(id);
         if (data == null) {
         if (data == null) {
             return CommonResult.fail("当前数据不存在,撤销失败!");
             return CommonResult.fail("当前数据不存在,撤销失败!");
         }
         }
 
 
-        RepairRecord rr = new RepairRecord();
-        rr.setId(id);
-        rr.setMaintenanceState(eRecordStatu.Canceled.getValue());
+        if (data.getMaintenanceState() != eRecordStatu.Dispatch.getValue() || data.getMaintenanceState() != eRecordStatu.ToConfirmed.getValue()) {
+            return CommonResult.fail("待接单或待确认才能进行撤销操作!");
+        }
+
+        try {
+            List<Integer> userIds = new ArrayList<>();
+            //获取该维修单的派单记录数据
+            List<RepairDispatchRecord> rdrs = repairDispatchRecordService.queryDispatchByRecordId(data.getId());
+            if (rdrs.size() > 0) {
+                userIds = rdrs.stream().map(RepairDispatchRecord::getUsersId).collect(Collectors.toList());
+                //将该维修单的派单记录和接单记录都置为无效
+                RepairDispatchRecord rdr = new RepairDispatchRecord();
+                int updateD = repairDispatchRecordService.updateDispatch(data.getId(), rdr.setIsLoseEfficacy(eDispatchResult.Expired.getValue()));
+                if (updateD <= 0) {
+                    throw new Exception("撤销失败!");
+                }
+                if (rdrs.get(0).getReceivingTime() != null) {
+                    RepairReceiving rr = new RepairReceiving();
+                    int updateR = repairReceivingService.updateReceiving(data.getId(), rr.setIsLoseEfficacy(eDispatchResult.Expired.getValue()));
+                    if (updateR <= 0) {
+                        throw new Exception("撤销失败!");
+                    }
+                }
+            }
+
+            if (userIds.size() > 0) {
+                List<RepairSystemMessages> rsms = new ArrayList<>();
+                for (int i = 0; i < userIds.size(); i++) {
+                    RepairSystemMessages rsm = new RepairSystemMessages();
+                    rsm.setIsRead(0);
+                    rsm.setRecordId(data.getId());
+                    rsm.setRecipientId(userIds.get(i));
+                    rsm.setContent("工单已被用户取消!");
+                    rsms.add(rsm);
+                }
+                boolean insertRsm = repairSystemMessagesService.inserBatchSystemMessage(rsms);
+                if (!insertRsm) {
+                    throw new Exception("撤销失败!");
+                }
+            }
+
+            data.setMaintenanceState(eRecordStatu.Canceled.getValue());
+            int result = repairRecordService.updateRepairRecord(data);
+            if (result <= 0) {
+                throw new Exception("撤销失败!");
+            }
+        } catch (Exception e) {
+            throw new Exception("撤销失败!");
+        }
 
 
-        int result = repairRecordService.updateRepairRecord(rr);
 
 
-        return result > 0 ? CommonResult.ok("撤销成功") : CommonResult.fail("撤销失败");
+        return CommonResult.ok("撤销成功");
     }
     }
 
 
     @Override//还要处理一下订单超时状态
     @Override//还要处理一下订单超时状态
@@ -386,22 +473,41 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         }
         }
 
 
         List<String> cardnumber = new ArrayList<>();
         List<String> cardnumber = new ArrayList<>();
+        List<Integer> userIds = new ArrayList<>();
 
 
         // 有的话就发给被派单的维修师傅
         // 有的话就发给被派单的维修师傅
         // 否则就发给郭师傅
         // 否则就发给郭师傅
         List<RepairCardNumberVo> cardNumbers = repairDispatchRecordService.queryRepairCardNumber(recordId);
         List<RepairCardNumberVo> cardNumbers = repairDispatchRecordService.queryRepairCardNumber(recordId);
         if (cardNumbers.size() <= 0) {
         if (cardNumbers.size() <= 0) {
+            //获取郭师傅的卡号把消息发给郭师傅
             List<Integer> uz = new ArrayList<>();
             List<Integer> uz = new ArrayList<>();
             uz.add(eUserZZ.Monitor.getValue());
             uz.add(eUserZZ.Monitor.getValue());
             List<RepairUser> users = repairUserService.getRepairByUserZZ(uz, record.getSchoolId());
             List<RepairUser> users = repairUserService.getRepairByUserZZ(uz, record.getSchoolId());
             cardnumber = users.stream().map(RepairUser::getCardNumber).collect(Collectors.toList());
             cardnumber = users.stream().map(RepairUser::getCardNumber).collect(Collectors.toList());
+            userIds = users.stream().map(RepairUser::getId).collect(Collectors.toList());
         } else {
         } else {
             cardnumber = cardNumbers.stream().map(RepairCardNumberVo::getCardNumber).collect(Collectors.toList());
             cardnumber = cardNumbers.stream().map(RepairCardNumberVo::getCardNumber).collect(Collectors.toList());
+            userIds = cardNumbers.stream().map(RepairCardNumberVo::getUserId).collect(Collectors.toList());
         }
         }
 
 
         if (cardnumber.size() <= 0) {
         if (cardnumber.size() <= 0) {
             return CommonResult.fail("当前工单无接收人,催单失败");
             return CommonResult.fail("当前工单无接收人,催单失败");
         }
         }
+
+        List<RepairSystemMessages> rsms = new ArrayList<>();
+        for (int i = 0; i < userIds.size(); i++) {
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setIsRead(0);
+            rsm.setRecordId(recordId);
+            rsm.setRecipientId(userIds.get(i));
+            rsm.setContent("您有工单用户催促,请尽快处理!");
+            rsms.add(rsm);
+        }
+        boolean insertS = repairSystemMessagesService.inserBatchSystemMessage(rsms);
+        if (!insertS) {
+            return CommonResult.fail("催单失败");
+        }
+
         String content = MessageFormat.format("【报修系统】维修师傅,你好,工单{0}用户催单,请及时处理,谢谢!", record.getRecordNo());
         String content = MessageFormat.format("【报修系统】维修师傅,你好,工单{0}用户催单,请及时处理,谢谢!", record.getRecordNo());
         CommonResult result = weiXiaoUtil.sendNotice(cardnumber, "报修工单催单", "催单", content, null);
         CommonResult result = weiXiaoUtil.sendNotice(cardnumber, "报修工单催单", "催单", content, null);
         return result;
         return result;
@@ -607,8 +713,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
     }
 
 
     @Override
     @Override
-    public CommonResult queryPendingOrder(int currentPage, int pageCount, int userId) {
-        PageUtils<pendingOrderVo> result = repairRecordService.queryPendingOrder(currentPage, pageCount, userId);
+    public CommonResult queryPendingOrder(int currentPage, int pageCount) {
+        PageUtils<pendingOrderVo> result = repairRecordService.queryPendingOrder(currentPage, pageCount);
         return CommonResult.ok(result);
         return CommonResult.ok(result);
     }
     }
 
 
@@ -759,12 +865,22 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 throw new Exception("抢单失败!");
                 throw new Exception("抢单失败!");
             }
             }
 
 
+            //给用户发消息
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setIsRead(0);
+            rsm.setRecordId(recordId);
+            rsm.setRecipientId(recordData.getUserId());
+            rsm.setContent("工单已被" + recordData.getMaintenancerName() + "接单,电话" + recordData.getMaintenancerPhone() + ",师傅会尽快上门维修。");
+            int insertRsm = repairSystemMessagesService.insertRepairSystemMessages(rsm);
+            if (insertRsm <= 0) {
+                throw new Exception("抢单失败!");
+            }
+
         } catch (Exception e) {
         } catch (Exception e) {
-            //return CommonResult.fail("抢单失败");
             throw new Exception("抢单失败!");
             throw new Exception("抢单失败!");
         }
         }
 
 
-        return CommonResult.ok("抢单成功");
+        return CommonResult.ok("工单已被您接单,请和用户确认上门维修时间");
     }
     }
 
 
     /**
     /**
@@ -873,7 +989,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
 
             //将工单状态更新为维修中
             //将工单状态更新为维修中
             recordData.setMaintenanceState(eRecordStatu.Maintenance.getValue());
             recordData.setMaintenanceState(eRecordStatu.Maintenance.getValue());
-            String mi = dispatch.getOrderType() == eDispatchType.Cooperation.getValue() ? recordData.getMaintenancerId() + "," + String.valueOf(userId) : String.valueOf(userId);
+            String mi = dispatch.getOrderType() == eDispatchType.Cooperation.getValue() ? recordData.getMaintenancerId() == null ? String.valueOf(userId) : recordData.getMaintenancerId() + "," + String.valueOf(userId) : String.valueOf(userId);
             recordData.setMaintenancerId(mi);
             recordData.setMaintenancerId(mi);
             recordData.setMaintenancerName(result.getUserName());
             recordData.setMaintenancerName(result.getUserName());
             recordData.setMaintenancerPhone(result.getUserPhone());
             recordData.setMaintenancerPhone(result.getUserPhone());
@@ -903,10 +1019,21 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 throw new Exception("接单失败!");
                 throw new Exception("接单失败!");
             }
             }
 
 
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setIsRead(0);
+            rsm.setRecordId(recordId);
+            rsm.setRecipientId(userId);
+            rsm.setContent("工单已被" + result.getUserName() + "接单,电话" + result.getUserPhone() + ",师傅会尽快上门维修。");
+            int insertRsm = repairSystemMessagesService.insertRepairSystemMessages(rsm);
+            if (insertRsm <= 0) {
+                throw new Exception("报修单提交失败!");
+            }
+
         } catch (Exception e) {
         } catch (Exception e) {
             throw new Exception("接单失败!");
             throw new Exception("接单失败!");
         }
         }
-        return CommonResult.ok("接单成功");
+
+        return CommonResult.ok("工单已被您接单,请和用户确认上门维修时间");
     }
     }
 
 
     /**
     /**
@@ -1025,6 +1152,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
             repairTrackRecord.setRecordId(rsor.getRecordId());
             repairTrackRecord.setRecordId(rsor.getRecordId());
             repairTrackRecord.setContent("派单");
             repairTrackRecord.setContent("派单");
+            repairTrackRecord.setMaintenanceState(rr.getMaintenanceState());
             int insertTrack = repairTrackRecordService.insertRepairTrackRecord(repairTrackRecord);
             int insertTrack = repairTrackRecordService.insertRepairTrackRecord(repairTrackRecord);
             if (insertTrack <= 0) {
             if (insertTrack <= 0) {
                 throw new Exception("派单失败!");
                 throw new Exception("派单失败!");
@@ -1044,15 +1172,28 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      * @throws Exception
      * @throws Exception
      */
      */
     @Override
     @Override
-    public CommonResult dropDown() throws Exception {
-//        将可以接单的师傅显示到协作下拉框中(员工状态 大量接单:1)
-        LambdaQueryWrapper<RepairUser> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(RepairUser::getState, eUserStatu.Received.getValue())
-                .eq(RepairUser::getUserZzid, eUserZZ.Maintenance.getValue());
+    public CommonResult dropDown(Integer recordId) throws Exception {
+
+        RepairRecord rr = repairRecordService.getRepairById(recordId);
+
+        if (rr == null) {
+            return CommonResult.fail("维修单无效,获取维修师傅数据失败");
+        }
 
 
-        List<RepairUser> repairUsers = repairUserService.list(wrapper);
+        Integer buildId = rr.getBuildId();
+        Integer articleId = rr.getArticleId();
+        Integer schoolId = rr.getSchoolId();
 
 
-        return CommonResult.ok(repairUsers);
+        List<AutoDispatchUserVo> autoDispatchUserVos = repairUserService.dropDown(buildId, articleId, schoolId);
+
+////        将可以接单的师傅显示到协作下拉框中(员工状态 大量接单:1)
+//        LambdaQueryWrapper<RepairUser> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(RepairUser::getState, eUserStatu.Received.getValue())
+//                .like(RepairUser::getArticle_id,articleId);
+//
+//        List<RepairUser> repairUsers = repairUserService.list(wrapper);
+
+        return CommonResult.ok(autoDispatchUserVos);
     }
     }
 
 
     /**
     /**
@@ -1071,6 +1212,10 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail(st);
             return CommonResult.fail(st);
         }
         }
 
 
+        if (eApprovalStatu.Agree.getValue() == tr.getApproverStatu() && tr.getUserId() == null) {
+            return CommonResult.fail("被派单师傅不能为空");
+        }
+
         //获取转单审核数据
         //获取转单审核数据
         RepairTransferRecord transferRecord = repairTransferRecordService.getById(tr.getId());
         RepairTransferRecord transferRecord = repairTransferRecordService.getById(tr.getId());
         if (transferRecord == null) {
         if (transferRecord == null) {
@@ -1086,12 +1231,6 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail("维修单状态异常,审核失败");
             return CommonResult.fail("维修单状态异常,审核失败");
         }
         }
 
 
-        //被派单用户
-        RepairUser repairUser = repairUserService.getById(tr.getUserId());
-        if (repairUser == null) {
-            return CommonResult.fail("被派单师傅数据异常,审核失败");
-        }
-
         String userID = AesUtils.decrypt(userhead);
         String userID = AesUtils.decrypt(userhead);
         RepairAdmin operateData = repairAdminService.getRepairById(userID);
         RepairAdmin operateData = repairAdminService.getRepairById(userID);
         if (operateData == null) {
         if (operateData == null) {
@@ -1118,6 +1257,12 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             }
             }
 
 
             if (eApprovalStatu.Agree.getValue() == tr.getApproverStatu()) {
             if (eApprovalStatu.Agree.getValue() == tr.getApproverStatu()) {
+                //被派单用户
+                RepairUser repairUser = repairUserService.getById(tr.getUserId());
+                if (repairUser == null) {
+                    return CommonResult.fail("被派单师傅数据异常,审核失败");
+                }
+
                 //同意
                 //同意
                 //添加派单记录
                 //添加派单记录
                 RepairDispatchRecord repairDispatchRecord = new RepairDispatchRecord();
                 RepairDispatchRecord repairDispatchRecord = new RepairDispatchRecord();
@@ -1145,10 +1290,22 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
             repairTrackRecord.setRecordId(rr.getId());
             repairTrackRecord.setRecordId(rr.getId());
             repairTrackRecord.setContent("转单审核");
             repairTrackRecord.setContent("转单审核");
+            repairTrackRecord.setMaintenanceState(rr.getMaintenanceState());
             int insertTrack = repairTrackRecordService.insertRepairTrackRecord(repairTrackRecord);
             int insertTrack = repairTrackRecordService.insertRepairTrackRecord(repairTrackRecord);
             if (insertTrack <= 0) {
             if (insertTrack <= 0) {
                 throw new Exception("转单审核失败!");
                 throw new Exception("转单审核失败!");
             }
             }
+
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setIsRead(0);
+            rsm.setRecordId(transferRecord.getRecordId());
+            rsm.setRecipientId(transferRecord.getApproverId());
+            rsm.setContent(eApprovalStatu.Agree.getValue() == tr.getApproverStatu() ? "您的审核工单已通过!" : "您的审核工单被驳回");
+            int insertRsm = repairSystemMessagesService.insertRepairSystemMessages(rsm);
+            if (insertRsm <= 0) {
+                throw new Exception("协作审核失败!");
+            }
+
         } catch (Exception e) {
         } catch (Exception e) {
             throw new Exception("转单审核失败!");
             throw new Exception("转单审核失败!");
         }
         }
@@ -1301,10 +1458,22 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
             RepairTrackRecord repairTrackRecord = new RepairTrackRecord();
             repairTrackRecord.setRecordId(rr.getId());
             repairTrackRecord.setRecordId(rr.getId());
             repairTrackRecord.setContent("协作审核");
             repairTrackRecord.setContent("协作审核");
+            repairTrackRecord.setMaintenanceState(rr.getMaintenanceState());
             int insertTrack = repairTrackRecordService.insertRepairTrackRecord(repairTrackRecord);
             int insertTrack = repairTrackRecordService.insertRepairTrackRecord(repairTrackRecord);
             if (insertTrack <= 0) {
             if (insertTrack <= 0) {
                 throw new Exception("协作审核失败!");
                 throw new Exception("协作审核失败!");
             }
             }
+
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setIsRead(0);
+            rsm.setRecordId(collaborateRecord.getRecordId());
+            rsm.setRecipientId(collaborateRecord.getApproverId());
+            rsm.setContent(eApprovalStatu.Agree.getValue() == cor.getApproverStatu() ? "您的审核工单已通过!" : "您的审核工单被驳回");
+            int insertRsm = repairSystemMessagesService.insertRepairSystemMessages(rsm);
+            if (insertRsm <= 0) {
+                throw new Exception("协作审核失败!");
+            }
+
         } catch (Exception e) {
         } catch (Exception e) {
             throw new Exception("协作审核失败!");
             throw new Exception("协作审核失败!");
         }
         }
@@ -1746,15 +1915,17 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 //        状态为0是查全部,为1查派单中。为2查维修中,3查转后勤,4是查转单待审核,协作待审核,5是查已完成,6是查已取消,7是查已关单,8是查维修中值班单
 //        状态为0是查全部,为1查派单中。为2查维修中,3查转后勤,4是查转单待审核,协作待审核,5是查已完成,6是查已取消,7是查已关单,8是查维修中值班单
 
 
 
 
-        String userID = AesUtils.decrypt(userhead);
-        RepairAdmin operateData = repairAdminService.getRepairById(userID);
-        if (operateData == null) {
-//            return CommonResult.fail("操作人信息不合法,无法获取工单数据!");
-            return;
-        }
-        if (operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
-            schoolId = null;
-        }
+//        String userID = AesUtils.decrypt(userhead);
+//        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+//        if (operateData == null) {
+////            return CommonResult.fail("操作人信息不合法,无法获取工单数据!");
+//            return;
+//        }
+//
+//        if (operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+//            schoolId = null;
+//        }
+
 
 
         List<ReportExportVo> result = null;
         List<ReportExportVo> result = null;
 
 
@@ -1899,6 +2070,302 @@ public class RepairRecordController implements RepairRecordControllerAPI {
         return CommonResult.ok(result);
         return CommonResult.ok(result);
     }
     }
 
 
+    /**
+     * 报修校区统计
+     *
+     * @param state
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult repairCampus(int state) throws Exception {
+
+
+//    全部
+        if (state == 0) {
+            List<RepairCampusVo> campusVoList = repairRecordService.repairCampusTotal();
+            return CommonResult.ok(campusVoList);
+        }
+
+        String startTime = DateUtils.startTime(state);
+        String endTime = DateUtils.endTime();
+
+        if (ObjectUtils.isEmpty(startTime)) {
+            return CommonResult.fail("参数有误");
+        }
+
+
+        List<RepairCampusVo> campusVoList = repairRecordService.repairCampus(startTime, endTime);
+
+
+        return CommonResult.ok(campusVoList);
+    }
+
+    /**
+     * 报修区域
+     *
+     * @param state
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult repairArea(int state) throws Exception {
+        //    全部
+        if (state == 0) {
+            List<RepairAreaVo> repairAreaTotal = repairRecordService.repairAreaTotal();
+            return CommonResult.ok(repairAreaTotal);
+        }
+
+        String startTime = DateUtils.startTime(state);
+        String endTime = DateUtils.endTime();
+
+        if (ObjectUtils.isEmpty(startTime)) {
+            return CommonResult.fail("参数有误");
+        }
+
+        List<RepairAreaVo> repairAreaTotal = repairRecordService.repairArea(startTime, endTime);
+
+        return CommonResult.ok(repairAreaTotal);
+    }
+
+    /**
+     * 维修物品
+     *
+     * @param state
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult maintenanceGoods(int state) throws Exception {
+        //    全部
+        if (state == 0) {
+            List<MaintenanceGoodsVo> maintenanceGoodsVoList = repairRecordService.maintenanceGoodsTotal();
+            return CommonResult.ok(maintenanceGoodsVoList);
+        }
+
+        String startTime = DateUtils.startTime(state);
+        String endTime = DateUtils.endTime();
+
+        if (ObjectUtils.isEmpty(startTime)) {
+            return CommonResult.fail("参数有误");
+        }
+
+        List<MaintenanceGoodsVo> maintenanceGoodsVoList = repairRecordService.maintenanceGoods(startTime, endTime);
+        return CommonResult.ok(maintenanceGoodsVoList);
+    }
+
+    /**
+     * 维修师傅
+     *
+     * @param state
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult maintenanceWorker(int state) throws Exception {
+
+        String startTime = DateUtils.startTime(state);
+        String endTime = DateUtils.endTime();
+
+        LambdaQueryWrapper<RepairReceiving> wrapperReceiving = new LambdaQueryWrapper<>();
+        wrapperReceiving.between(ObjectUtils.isNotEmpty(startTime), RepairReceiving::getReceivingTime, startTime, endTime);
+        wrapperReceiving.isNotNull(RepairReceiving::getFinishTime);
+        List<RepairReceiving> repairReceivingList = repairReceivingService.list(wrapperReceiving);
+
+        ArrayList<Integer> userList = new ArrayList<>();
+
+//        ArrayList<Integer> recordList = new ArrayList<>();
+
+//        接单总次数
+        HashMap<Integer, List<Integer>> receivingCountMap = new HashMap<>();
+
+//        维修超时次数
+        Map<Integer, Integer> maintainTimeOutMap = new HashMap<>();
+
+//        维修总时长
+        Map<Integer, Long> maintainMap = new HashMap<>();
+
+
+        for (RepairReceiving repairReceiving : repairReceivingList) {
+            Date finishTime = repairReceiving.getFinishTime();
+
+            if (ObjectUtils.isEmpty(finishTime)) {
+                break;
+            }
+
+            Integer userId = repairReceiving.getUserId();
+            userList.add(userId);
+
+            Integer recordId = repairReceiving.getRecordId();
+//            recordList.add(recordId);
+
+            if (receivingCountMap.containsKey(userId)) {
+//                  总次数
+                List<Integer> list = receivingCountMap.get(userId);
+                list.add(recordId);
+                receivingCountMap.put(userId, list);
+            } else {
+                ArrayList<Integer> list = new ArrayList<>();
+                list.add(recordId);
+                receivingCountMap.put(userId, list);
+            }
+
+
+//            接单时间
+            long receivingTime = repairReceiving.getReceivingTime().getTime();
+//            考核时间(分)
+            Integer maintenanceAssessTime = repairReceiving.getMaintenanceAssessTime() * 1000 * 60;
+
+            long time = receivingTime + maintenanceAssessTime;
+
+//            完成时间
+            long finishTimeTime = finishTime.getTime();
+
+//              实际完成时间大于接单时间加考核时间为超时
+            if (finishTimeTime > time) {
+                if (maintainTimeOutMap.containsKey(userId)) {
+//                  次数
+                    Integer count = maintainTimeOutMap.get(userId);
+                    count = count + 1;
+                    maintainTimeOutMap.put(userId, count);
+                } else {
+                    maintainTimeOutMap.put(userId, 1);
+                }
+            }
+
+//            维修时长=完成时间-接单时间(分)
+            long maintainTime = finishTimeTime - receivingTime;
+            maintainTime=maintainTime/1000/60;
+
+            if (maintainMap.containsKey(userId)) {
+//                  维修时长
+                Long maintainTotalTime = maintainMap.get(userId);
+                maintainTotalTime = maintainTotalTime + maintainTime;
+                maintainMap.put(userId, maintainTotalTime);
+            } else {
+                maintainMap.put(userId, maintainTime);
+            }
+
+
+        }
+
+        LambdaQueryWrapper<RepairUser> userWrapper=new LambdaQueryWrapper<>();
+        userWrapper.in(RepairUser::getId,userList);
+
+        List<RepairUser> users = repairUserService.list(userWrapper);
+
+
+
+
+        Wrapper<RepairSchool> schoolWrapper=new LambdaQueryWrapper<>();
+        List<RepairSchool> schoolList = repairSchoolService.list(schoolWrapper);
+
+        users.forEach(repairUser -> {
+            MaintenanceWorkerVo maintenanceWorkerVo = new MaintenanceWorkerVo();
+//            名字
+            maintenanceWorkerVo.setName(repairUser.getUserName());
+
+//            学校
+            Integer schoolId = repairUser.getSchoolId();
+            for (RepairSchool repairSchool : schoolList) {
+                Integer id = repairSchool.getId();
+                if (id.equals(schoolId)) {
+                    maintenanceWorkerVo.setName(repairSchool.getName());
+                }
+            }
+
+            Integer id = repairUser.getId();
+//            工单集合
+            List<Integer> recordsList = receivingCountMap.get(id);
+            int size = recordsList.size();
+            BigDecimal b = new BigDecimal(size);
+
+//            工单总数
+            maintenanceWorkerVo.setWorkOrderTotal(size);
+
+//            超时率
+            if (maintainTimeOutMap.containsKey(id)) {
+                Integer integer = maintainTimeOutMap.get(id);
+                BigDecimal a = new BigDecimal(integer);
+                BigDecimal bigDecimal = a.divide(b).setScale(2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal multiply = bigDecimal.multiply(new BigDecimal(100));
+                maintenanceWorkerVo.setTimeOut(multiply+"%");
+            }
+
+//            平均维修时间
+            Long aLong = maintainMap.get(id);
+            BigDecimal bigDecimal = new BigDecimal(aLong);
+            BigDecimal maintain = bigDecimal.divide(b).setScale(2, BigDecimal.ROUND_HALF_UP);
+            maintenanceWorkerVo.setMaintain(maintain);
+
+//            总费用
+            LambdaQueryWrapper<RepairRecord> recordWrapper=new LambdaQueryWrapper<>();
+            recordWrapper.in(RepairRecord::getId,recordsList);
+
+            List<RepairRecord> list = repairRecordService.list(recordWrapper);
+            BigDecimal totalPrice=new BigDecimal(0);
+            for (RepairRecord repairRecord : list) {
+                BigDecimal price = repairRecord.getPrice();
+                totalPrice=totalPrice.add(price);
+            }
+            maintenanceWorkerVo.setTotalPrice(totalPrice);
+
+//            好评率
+            LambdaQueryWrapper<RepairEvaluate> evaluateWrapper=new LambdaQueryWrapper<>();
+            evaluateWrapper.in(RepairEvaluate::getRecordId,recordsList);
+//      根据工单id来查询对应的评价
+            List<RepairEvaluate> repairEvaluates = repairEvaluateService.list(evaluateWrapper);
+            BigDecimal evaluatesDecimal = new BigDecimal(repairEvaluates.size());
+            BigDecimal satisfaction=new BigDecimal(0);
+            for (RepairEvaluate repairEvaluate : repairEvaluates) {
+                Integer star = repairEvaluate.getStar();
+                if (star>3) {
+                    satisfaction=satisfaction.add(new BigDecimal(1));
+                }
+            }
+            BigDecimal degreePraise = satisfaction.divide(evaluatesDecimal,2).setScale(2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
+            maintenanceWorkerVo.setDegreePraise(degreePraise+"%");
+
+//        平均响应时长
+            LambdaQueryWrapper<RepairDispatchRecord> rdrsWrapper=new LambdaQueryWrapper<>();
+            rdrsWrapper.in(RepairDispatchRecord::getRecordId,recordsList);
+
+            List<RepairDispatchRecord> repairDispatchRecords = repairDispatchRecordService.list(rdrsWrapper);
+
+
+
+
+
+
+
+
+        });
+
+
+
+
+
+
+
+        return null;
+    }
+
+    /**
+     * 报修分析
+     *
+     * @param state
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CommonResult repairAnalysis(int state) throws Exception {
+        String startTime = DateUtils.startTime(state);
+        String endTime = DateUtils.endTime();
+
+
+        return null;
+    }
+
     @Override
     @Override
     public CommonResult mobileReply(MobileRevertRequest mrr, BindingResult bindingResult) throws Exception {
     public CommonResult mobileReply(MobileRevertRequest mrr, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
         if (bindingResult.hasErrors()) {
@@ -1948,6 +2415,17 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             if (!save) {
             if (!save) {
                 throw new Exception("回复失败!");
                 throw new Exception("回复失败!");
             }
             }
+
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setIsRead(0);
+            rsm.setRecordId(mrr.getRecordId());
+            rsm.setRecipientId(recipientId);
+            rsm.setContent("用户已回复,请尽快处理!");
+            int insertRsm = repairSystemMessagesService.insertRepairSystemMessages(rsm);
+            if (insertRsm <= 0) {
+                throw new Exception("回复失败!");
+            }
+
         } catch (Exception e) {
         } catch (Exception e) {
             throw new Exception("回复失败!");
             throw new Exception("回复失败!");
         }
         }
@@ -1956,7 +2434,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     }
     }
 
 
     @Override
     @Override
-    public CommonResult closeOrders(int recordId, String userId, String reason) {
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult closeOrders(int recordId, String userId, String reason) throws Exception {
 
 
         //获取订单
         //获取订单
         RepairRecord recordData = repairRecordService.getRepairById(recordId);
         RepairRecord recordData = repairRecordService.getRepairById(recordId);
@@ -1969,13 +2448,27 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail("待接单状态的工单才能关闭");
             return CommonResult.fail("待接单状态的工单才能关闭");
         }
         }
 
 
-        //将工单状态更新为维修中
-        recordData.setCustomsOfficerId(userId);
-        recordData.setRemark(reason);
-        recordData.setMaintenanceState(eRecordStatu.Closed.getValue());
-        int updateRecord = repairRecordService.updateRepairRecord(recordData);
-        if (updateRecord <= 0) {
-            return CommonResult.fail("关单失败!");
+        try {
+            //将工单状态更新为维修中
+            recordData.setCustomsOfficerId(userId);
+            recordData.setRemark(reason);
+            recordData.setMaintenanceState(eRecordStatu.Closed.getValue());
+            int updateRecord = repairRecordService.updateRepairRecord(recordData);
+            if (updateRecord <= 0) {
+                return CommonResult.fail("关单失败!");
+            }
+
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setIsRead(0);
+            rsm.setRecordId(recordId);
+            rsm.setRecipientId(recordData.getUserId());
+            rsm.setContent("工单已被师傅关闭,关单原因为:" + reason + "!");
+            int insertRsm = repairSystemMessagesService.insertRepairSystemMessages(rsm);
+            if (insertRsm <= 0) {
+                throw new Exception("关单失败!");
+            }
+        } catch (Exception e) {
+            throw new Exception("关单失败!");
         }
         }
 
 
         return CommonResult.ok("关单成功");
         return CommonResult.ok("关单成功");
@@ -2041,6 +2534,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
 
             //将工单状态更新为已完成
             //将工单状态更新为已完成
             recordData.setFinishVoice(data.getVoice());
             recordData.setFinishVoice(data.getVoice());
+            recordData.setFinishVoiceLength(data.getVoiceLength());
             recordData.setContent(data.getContnet());
             recordData.setContent(data.getContnet());
             recordData.setMaintenancer(data.getImages().size() > 0 ? StringUtils.join(data.getImages(), ',') : null);
             recordData.setMaintenancer(data.getImages().size() > 0 ? StringUtils.join(data.getImages(), ',') : null);
             recordData.setMaintenanceState(eRecordStatu.Finished.getValue());
             recordData.setMaintenanceState(eRecordStatu.Finished.getValue());
@@ -2057,6 +2551,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 throw new Exception("提交失败!");
                 throw new Exception("提交失败!");
             }
             }
 
 
+            RepairSystemMessages rsm = new RepairSystemMessages();
+            rsm.setIsRead(0);
+            rsm.setRecordId(data.getRecordId());
+            rsm.setRecipientId(recordData.getUserId());
+            rsm.setContent("服务已经完成,期待再次为您服务,请为我们的服务点评~");
+            int insertRsm = repairSystemMessagesService.insertRepairSystemMessages(rsm);
+            if (insertRsm <= 0) {
+                throw new Exception("提交失败!");
+            }
+
         } catch (Exception e) {
         } catch (Exception e) {
             throw new Exception("提交失败!");
             throw new Exception("提交失败!");
         }
         }
@@ -2091,6 +2595,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairTransferRecord rtr = new RepairTransferRecord();
             RepairTransferRecord rtr = new RepairTransferRecord();
             rtr.setRecordId(data.getRecordId());
             rtr.setRecordId(data.getRecordId());
             rtr.setVoice(data.getVoice());
             rtr.setVoice(data.getVoice());
+            rtr.setVoiceLength(data.getVoiceLength());
             rtr.setRemark(data.getRemark());
             rtr.setRemark(data.getRemark());
             rtr.setUserId(data.getUserId());
             rtr.setUserId(data.getUserId());
             rtr.setApprovalStatu(2);
             rtr.setApprovalStatu(2);
@@ -2106,6 +2611,26 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 throw new Exception("申请失败!");
                 throw new Exception("申请失败!");
             }
             }
 
 
+            //给郭班长和后勤发消息
+            List<Integer> userZZ = new ArrayList<>();
+            userZZ.add(2);
+            userZZ.add(3);
+            List<RepairUser> users = repairUserService.getRepairByUserZZ(userZZ, recordData.getSchoolId());
+            List<RepairSystemMessages> rsms = new ArrayList<>();
+            for (RepairUser user : users) {
+                RepairSystemMessages rsm = new RepairSystemMessages();
+                rsm.setIsRead(0);
+                rsm.setRecordId(result);
+                rsm.setRecipientId(user.getId());
+                rsm.setContent("您有一个审核工单,请尽快处理!");
+                rsms.add(rsm);
+            }
+
+            boolean insertRsm = repairSystemMessagesService.inserBatchSystemMessage(rsms);
+            if (!insertRsm) {
+                throw new Exception("转单审核发起失败!");
+            }
+
         } catch (Exception e) {
         } catch (Exception e) {
             throw new Exception("转单审核发起失败!");
             throw new Exception("转单审核发起失败!");
         }
         }
@@ -2146,6 +2671,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             RepairCollaborateRecord rcr = new RepairCollaborateRecord();
             RepairCollaborateRecord rcr = new RepairCollaborateRecord();
             rcr.setRecordId(data.getRecordId());
             rcr.setRecordId(data.getRecordId());
             rcr.setVoice(data.getVoice());
             rcr.setVoice(data.getVoice());
+            rcr.setVoiceLength(data.getVoiceLength());
             rcr.setRemark(data.getRemark());
             rcr.setRemark(data.getRemark());
             rcr.setUserId(data.getUserId());
             rcr.setUserId(data.getUserId());
             rcr.setApprovalStatu(2);
             rcr.setApprovalStatu(2);
@@ -2162,6 +2688,26 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 throw new Exception("申请失败!");
                 throw new Exception("申请失败!");
             }
             }
 
 
+            //给郭班长和后勤发消息
+            List<Integer> userZZ = new ArrayList<>();
+            userZZ.add(2);
+            userZZ.add(3);
+            List<RepairUser> users = repairUserService.getRepairByUserZZ(userZZ, recordData.getSchoolId());
+            List<RepairSystemMessages> rsms = new ArrayList<>();
+            for (RepairUser user : users) {
+                RepairSystemMessages rsm = new RepairSystemMessages();
+                rsm.setIsRead(0);
+                rsm.setRecordId(result);
+                rsm.setRecipientId(user.getId());
+                rsm.setContent("您有一个审核工单,请尽快处理!");
+                rsms.add(rsm);
+            }
+
+            boolean insertRsm = repairSystemMessagesService.inserBatchSystemMessage(rsms);
+            if (!insertRsm) {
+                throw new Exception("转单审核发起失败!");
+            }
+
         } catch (Exception e) {
         } catch (Exception e) {
             throw new Exception("协作审核发起失败!");
             throw new Exception("协作审核发起失败!");
         }
         }

+ 17 - 1
src/main/java/com/repair/controller/RepairSystemMessagesController.java

@@ -6,6 +6,7 @@ import com.repair.common.utils.paramUtils;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.result.PageUtils;
+import com.repair.model.vo.SystemMessagePageVo;
 import com.repair.services.RepairSystemMessagesService;
 import com.repair.services.RepairSystemMessagesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;
@@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
  * <p>
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  * </p>
  *
  *
  * @author ceshi
  * @author ceshi
@@ -68,5 +69,20 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
 
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
     }
+
+    @Override
+    public CommonResult querySystemMessagePage(int currentPage, int pageCount, int userId) {
+        PageUtils<SystemMessagePageVo> result = repairSystemMessagesService.querySystemMessagePage(currentPage, pageCount, userId);
+        return CommonResult.ok(result);
+    }
+
+    @Override
+    public CommonResult readSystemMessage(int id) {
+        RepairSystemMessages rsm = new RepairSystemMessages();
+        rsm.setId(id);
+        rsm.setIsRead(1);
+        int uRsm = repairSystemMessagesService.updateRepairSystemMessages(rsm);
+        return CommonResult.ok();
+    }
 }
 }
 
 

+ 6 - 2
src/main/java/com/repair/mapper/RepairEvaluateMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairEvaluate;
 import com.repair.model.pojo.RepairEvaluate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.repair.model.vo.EvaluateVo;
 import com.repair.model.vo.EvaluateVo;
+import com.repair.model.vo.RecordEvaluateVo;
 import com.repair.model.vo.RepairConsumeVo;
 import com.repair.model.vo.RepairConsumeVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
@@ -13,7 +14,7 @@ import java.util.List;
 
 
 /**
 /**
  * <p>
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  * </p>
  *
  *
  * @author ceshi
  * @author ceshi
@@ -21,6 +22,9 @@ import java.util.List;
  */
  */
 @Repository
 @Repository
 public interface RepairEvaluateMapper extends BaseMapper<RepairEvaluate> {
 public interface RepairEvaluateMapper extends BaseMapper<RepairEvaluate> {
-    List<EvaluateVo> queryEvaluatePageList(@Param("keyWord") String keyWord,@Param("startTime") String startTime,@Param("endTime") String endTime);
+    List<EvaluateVo> queryEvaluatePageList(@Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
     IPage<EvaluateVo> queryEvaluatePageList(IPage<EvaluateVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
     IPage<EvaluateVo> queryEvaluatePageList(IPage<EvaluateVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<RecordEvaluateVo> queryEvaluateList(@Param("dateStr") String dateStr);
 }
 }

+ 13 - 1
src/main/java/com/repair/mapper/RepairRecordMapper.java

@@ -39,7 +39,7 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
 
 
     IPage<RepairRecordPageVo> queryTimeout(IPage<RepairRecordPageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("schoolId") Integer schoolId);
     IPage<RepairRecordPageVo> queryTimeout(IPage<RepairRecordPageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("schoolId") Integer schoolId);
 
 
-    IPage<pendingOrderVo> queryPendingOrder(IPage<pendingOrderVo> page, @Param("userId") Integer userId);
+    IPage<pendingOrderVo> queryPendingOrder(IPage<pendingOrderVo> page);
 
 
     TeamWorkCountVo queryTeamWorkCount(@Param("schoolId") Integer schoolId, @Param("dateNow") String dateNow);
     TeamWorkCountVo queryTeamWorkCount(@Param("schoolId") Integer schoolId, @Param("dateNow") String dateNow);
 
 
@@ -64,4 +64,16 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
     MasterHomepageVo queryMasterHomeCount(@Param("userId") Integer userId);
     MasterHomepageVo queryMasterHomeCount(@Param("userId") Integer userId);
 
 
     MasterHomepageVo queryLogisticHomeCount(@Param("schoolId") Integer schoolId);
     MasterHomepageVo queryLogisticHomeCount(@Param("schoolId") Integer schoolId);
+	
+	List<RepairCampusVo> repairCampusTotal();
+
+    List<RepairCampusVo> repairCampus(String startTime, String endTime);
+
+    List<RepairAreaVo> repairAreaTotal();
+
+    List<RepairAreaVo> repairArea(String startTime, String endTime);
+
+    List<MaintenanceGoodsVo> maintenanceGoodsTotal();
+
+    List<MaintenanceGoodsVo> maintenanceGoods(String startTime, String endTime);
 }
 }

+ 5 - 0
src/main/java/com/repair/mapper/RepairSystemMessagesMapper.java

@@ -1,7 +1,11 @@
 package com.repair.mapper;
 package com.repair.mapper;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.vo.RepairTechnicianVo;
+import com.repair.model.vo.SystemMessagePageVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 /**
 /**
@@ -14,5 +18,6 @@ import org.springframework.stereotype.Repository;
  */
  */
 @Repository
 @Repository
 public interface RepairSystemMessagesMapper extends BaseMapper<RepairSystemMessages> {
 public interface RepairSystemMessagesMapper extends BaseMapper<RepairSystemMessages> {
+    IPage<SystemMessagePageVo> querySystemMessagePage(IPage<SystemMessagePageVo> page, @Param("userId") Integer userId);
 
 
 }
 }

+ 2 - 0
src/main/java/com/repair/mapper/RepairUserMapper.java

@@ -38,4 +38,6 @@ public interface RepairUserMapper extends BaseMapper<RepairUser> {
     IPage<RepairWorkTypeVo> queryCollaboratorUser(IPage<RepairWorkTypeVo> page, @Param("schoolId") Integer schoolId, @Param("userId") Integer userId, @Param("dateNow") String dateNow);
     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);
     IPage<PositiveReviewVo> queryPositiveReviewPage(IPage<PositiveReviewVo> page, @Param("schoolId") Integer schoolId);
+
+    List<AutoDispatchUserVo> dropDown(Integer buildId, Integer articleId, Integer schoolId);
 }
 }

+ 5 - 0
src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
@@ -57,6 +58,10 @@ public class RepairCollaborateRecord implements Serializable {
     @NotBlank(message = "语音不能为空")
     @NotBlank(message = "语音不能为空")
     private String voice;
     private String voice;
 
 
+    @ApiModelProperty(value = "语音时长 可能做成语音文件上传的方式 然后这个字段记录语音文件名")
+    @NotNull(message = "语音时长不能为空")
+    private Integer voiceLength;
+
     @ApiModelProperty(value = "备注")
     @ApiModelProperty(value = "备注")
     @NotBlank(message = "备注不能为空")
     @NotBlank(message = "备注不能为空")
     private String remark;
     private String remark;

+ 6 - 0
src/main/java/com/repair/model/pojo/RepairRecord.java

@@ -64,9 +64,15 @@ public class RepairRecord implements Serializable {
     @ApiModelProperty(value = "报修录音")
     @ApiModelProperty(value = "报修录音")
     private String voice;
     private String voice;
 
 
+    @ApiModelProperty(value = "录音时长")
+    private Integer voiceLength;
+
     @ApiModelProperty(value = "维修录音")
     @ApiModelProperty(value = "维修录音")
     private String finishVoice;
     private String finishVoice;
 
 
+    @ApiModelProperty(value = "维修录音时长")
+    private Integer finishVoiceLength;
+
     @ApiModelProperty(value = "维修内容")
     @ApiModelProperty(value = "维修内容")
     private String content;
     private String content;
 
 

+ 8 - 0
src/main/java/com/repair/model/pojo/RepairSystemMessages.java

@@ -49,6 +49,14 @@ public class RepairSystemMessages implements Serializable {
     @NotBlank(message = "内容不能为空")
     @NotBlank(message = "内容不能为空")
     private String content;
     private String content;
 
 
+    /**
+     * 未读:0
+     * 已读:1
+     */
+    @ApiModelProperty(value = "是否已读")
+    @NotNull(message = "是否已读不能为空")
+    private Integer isRead;
+
     @ApiModelProperty(value = "创建时间")
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
     private Date createTime;

+ 4 - 0
src/main/java/com/repair/model/pojo/RepairTrackRecord.java

@@ -45,6 +45,10 @@ public class RepairTrackRecord implements Serializable {
     @NotBlank(message = "跟踪内容不能为空")
     @NotBlank(message = "跟踪内容不能为空")
     private String content;
     private String content;
 
 
+    @ApiModelProperty(value = "维修状态")
+    @NotNull(message = "维修状态不能为空")
+    private Integer maintenanceState;
+
     @ApiModelProperty(value = "创建时间")
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
     private Date createTime;

+ 4 - 0
src/main/java/com/repair/model/pojo/RepairTransferRecord.java

@@ -45,6 +45,10 @@ public class RepairTransferRecord implements Serializable {
     @NotBlank(message = "语音不能为空")
     @NotBlank(message = "语音不能为空")
     private String voice;
     private String voice;
 
 
+    @ApiModelProperty(value = "语音时长 可能做成语音文件上传的方式 然后这个字段记录语音文件名")
+    @NotNull(message = "语音时长不能为空")
+    private Integer voiceLength;
+
     @ApiModelProperty(value = "备注")
     @ApiModelProperty(value = "备注")
     @NotBlank(message = "备注不能为空")
     @NotBlank(message = "备注不能为空")
     private String remark;
     private String remark;

+ 6 - 0
src/main/java/com/repair/model/request/collaborateApplyRequest.java

@@ -39,6 +39,12 @@ public class collaborateApplyRequest {
     private String voice;
     private String voice;
 
 
     /**
     /**
+     * 协作时长
+     */
+    @NotNull(message = "协作语音时长不能为空")
+    private Integer voiceLength;
+
+    /**
      * 备注
      * 备注
      */
      */
     private String remark;
     private String remark;

+ 5 - 0
src/main/java/com/repair/model/request/finishOrderRequest.java

@@ -32,6 +32,11 @@ public class finishOrderRequest {
     private String voice;
     private String voice;
 
 
     /**
     /**
+     * 录音时长
+     */
+    private Integer voiceLength;
+
+    /**
      * 关联耗材数据集合
      * 关联耗材数据集合
      */
      */
     private List<insertConsumablesRequest> consumes;
     private List<insertConsumablesRequest> consumes;

+ 3 - 0
src/main/java/com/repair/model/request/repairRecordRequest.java

@@ -44,6 +44,9 @@ public class repairRecordRequest {
     @ApiModelProperty(value = "报修录音")//不必填
     @ApiModelProperty(value = "报修录音")//不必填
     private String voice;
     private String voice;
 
 
+    @ApiModelProperty(value = "报修录音时长")//不必填
+    private Integer voiceLength;
+
     @ApiModelProperty(value = "故障图片 最多三张(多张按逗号隔开)")//必填
     @ApiModelProperty(value = "故障图片 最多三张(多张按逗号隔开)")//必填
     @NotEmpty(message = "报修图片不能为空")
     @NotEmpty(message = "报修图片不能为空")
     private List<String> images;
     private List<String> images;

+ 8 - 1
src/main/java/com/repair/model/request/transferApplyRequest.java

@@ -2,6 +2,7 @@ package com.repair.model.request;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 
 
 /**
 /**
@@ -27,10 +28,16 @@ public class transferApplyRequest {
     /**
     /**
      * 转单语音说明
      * 转单语音说明
      */
      */
-    @NotNull(message = "转单语音说明不能为空")
+    @NotBlank(message = "转单语音说明不能为空")
     private String voice;
     private String voice;
 
 
     /**
     /**
+     * 转单时长
+     */
+    @NotNull(message = "转单语音时长不能为空")
+    private Integer voiceLength;
+
+    /**
      * 备注
      * 备注
      */
      */
     private String remark;
     private String remark;

+ 0 - 1
src/main/java/com/repair/model/request/transferRequest.java

@@ -21,7 +21,6 @@ public class transferRequest {
     /**
     /**
      * 被派单师傅ID
      * 被派单师傅ID
      */
      */
-    @NotNull(message = "被派单师傅不能为空")
     private Integer userId;
     private Integer userId;
 
 
     /**
     /**

+ 6 - 0
src/main/java/com/repair/model/vo/CollaborateDetailVo.java

@@ -1,6 +1,7 @@
 package com.repair.model.vo;
 package com.repair.model.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.List;
 import java.util.List;
@@ -37,6 +38,11 @@ public class CollaborateDetailVo {
      * 语音
      * 语音
      */
      */
     private String voice;
     private String voice;
+    
+    /**
+     * 录音时长
+     */
+    private Integer voiceLength;
 
 
     /**
     /**
      * 备注
      * 备注

+ 22 - 0
src/main/java/com/repair/model/vo/MaintenanceGoodsVo.java

@@ -0,0 +1,22 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class MaintenanceGoodsVo {
+
+    private Integer id;
+    //  维修物品名称
+    private String articleName;
+    //  订单总数
+    private Integer ordersTotal;
+    //  有偿订单
+    private Integer ordersCompensation;
+    //  无偿订单
+    private Integer ordersGratis;
+    //  总费用
+    private BigDecimal totalPrice;
+
+}

+ 25 - 0
src/main/java/com/repair/model/vo/MaintenanceWorkerVo.java

@@ -0,0 +1,25 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class MaintenanceWorkerVo {
+    private String schoolName;
+
+    private String name;
+//  工单总数
+    private Integer workOrderTotal;
+//    好评率
+    private String degreePraise;
+//    超时率
+    private String timeOut;
+//    平均响应时长
+    private BigDecimal answer;
+//    平均维修时长
+    private BigDecimal maintain;
+//    总费用
+    private BigDecimal totalPrice;
+
+}

+ 28 - 0
src/main/java/com/repair/model/vo/RecordEvaluateVo.java

@@ -0,0 +1,28 @@
+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 RecordEvaluateVo {
+    /**
+     * 维修单ID
+     */
+    private int id;
+    /**
+     * 维修用户ID
+     */
+    private Integer userId;
+    /**
+     * 维修师傅ID
+     */
+    private String maintenancerId;
+
+}

+ 25 - 0
src/main/java/com/repair/model/vo/RepairAreaVo.java

@@ -0,0 +1,25 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class RepairAreaVo {
+    private Integer id;
+
+    //  学校名称
+    private String schoolName;
+    //  订单总数
+    private Integer ordersTotal;
+    //  有偿订单
+    private Integer ordersCompensation;
+    //  无偿订单
+    private Integer ordersGratis;
+    //   报修区域
+    private String areaName;
+    //  总费用
+    private BigDecimal totalPrice;
+
+
+}

+ 23 - 0
src/main/java/com/repair/model/vo/RepairCampusVo.java

@@ -0,0 +1,23 @@
+package com.repair.model.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class RepairCampusVo {
+
+    private Integer id;
+//  学校名称
+    private String schoolName;
+//  订单总数
+    private Integer ordersTotal;
+//  有偿订单
+    private Integer ordersCompensation;
+//  无偿订单
+    private Integer ordersGratis;
+//  总费用
+    private BigDecimal totalPrice;
+
+
+}

+ 7 - 0
src/main/java/com/repair/model/vo/RepairCardNumberVo.java

@@ -10,5 +10,12 @@ import lombok.Data;
  */
  */
 @Data
 @Data
 public class RepairCardNumberVo {
 public class RepairCardNumberVo {
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+    /**
+     * 用户微校卡号
+     */
     private String cardNumber;
     private String cardNumber;
 }
 }

+ 19 - 0
src/main/java/com/repair/model/vo/RepairRecordPageVo.java

@@ -1,6 +1,7 @@
 package com.repair.model.vo;
 package com.repair.model.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.repair.model.enumModel.eSchool;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.Date;
 import java.util.Date;
@@ -48,6 +49,24 @@ public class RepairRecordPageVo {
     private String description;
     private String description;
 
 
     /**
     /**
+     * 校区ID
+     */
+    private Integer schoolId;
+
+    /**
+     * 校区名称
+     */
+    private String school;
+
+    public String getSchool() {
+        return eSchool.stringOf(schoolId);
+    }
+
+    public void setSchool(String school) {
+        this.school = school;
+    }
+
+    /**
      * 订单维修状态
      * 订单维修状态
      */
      */
     @JsonIgnore
     @JsonIgnore

+ 39 - 0
src/main/java/com/repair/model/vo/SystemMessagePageVo.java

@@ -0,0 +1,39 @@
+package com.repair.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/7 星期一 8:48
+ * @Description: com.repair.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class SystemMessagePageVo {
+    /**
+     * 数据ID
+     */
+    private int id;
+    /**
+     * 工单号
+     */
+    private String recordNo;
+    /**
+     * 是否已读
+     * 未读:0
+     * 已读:1
+     */
+    private int isRead;
+    /**
+     * 内容
+     */
+    private String content;
+    /**
+     * 时间
+     */
+    private Date updateTime;
+
+}

+ 5 - 0
src/main/java/com/repair/model/vo/TransferDetailVo.java

@@ -28,6 +28,11 @@ public class TransferDetailVo {
     private String voice;
     private String voice;
 
 
     /**
     /**
+     * 录音时长
+     */
+    private Integer voiceLength;
+
+    /**
      * 备注
      * 备注
      */
      */
     private String remark;
     private String remark;

+ 2 - 0
src/main/java/com/repair/services/RepairDispatchRecordService.java

@@ -41,4 +41,6 @@ public interface RepairDispatchRecordService extends IService<RepairDispatchReco
     boolean updateDispatchBatch(List<RepairDispatchRecord> rdr);
     boolean updateDispatchBatch(List<RepairDispatchRecord> rdr);
 
 
     List<RepairDispatchRecord> queryDispatchByRecordId(Integer recordId);
     List<RepairDispatchRecord> queryDispatchByRecordId(Integer recordId);
+
+    int updateDispatch(Integer recordId, RepairDispatchRecord rdr);
 }
 }

+ 8 - 1
src/main/java/com/repair/services/RepairEvaluateService.java

@@ -4,6 +4,7 @@ import com.repair.model.pojo.RepairEvaluate;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.repair.model.result.PageUtils;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.EvaluateVo;
 import com.repair.model.vo.EvaluateVo;
+import com.repair.model.vo.RecordEvaluateVo;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -22,7 +23,13 @@ public interface RepairEvaluateService extends IService<RepairEvaluate> {
 
 
     PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime);
     PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime);
 
 
-    RepairEvaluate getRepairById(String id);
+    RepairEvaluate getRepairById(int id);
+
+    RepairEvaluate getRepairByRecordId(int recordId);
 
 
     List<EvaluateVo> queryEvaluateList(String keyWord, String startTime, String endTime);
     List<EvaluateVo> queryEvaluateList(String keyWord, String startTime, String endTime);
+
+    List<RecordEvaluateVo> queryEvaluateList(String dateStr);
+
+    boolean inserBatchEvaluate(List<RepairEvaluate> datas);
 }
 }

+ 2 - 0
src/main/java/com/repair/services/RepairReceivingService.java

@@ -34,4 +34,6 @@ public interface RepairReceivingService extends IService<RepairReceiving> {
     boolean updateReceivingBatch(List<RepairReceiving> rdr);
     boolean updateReceivingBatch(List<RepairReceiving> rdr);
 
 
     List<RepairReceiving> queryReceivingByRecordId(Integer recordId);
     List<RepairReceiving> queryReceivingByRecordId(Integer recordId);
+
+    int updateReceiving(Integer recordId, RepairReceiving rdr);
 }
 }

+ 14 - 1
src/main/java/com/repair/services/RepairRecordService.java

@@ -52,7 +52,7 @@ public interface RepairRecordService extends IService<RepairRecord> {
 
 
     PageUtils<RepairRecordPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId);
     PageUtils<RepairRecordPageVo> queryTimeout(int currentPage, int pageCount, String keyWord, String startTime, String endTime, Integer schoolId);
 
 
-    PageUtils<pendingOrderVo> queryPendingOrder(int currentPage, int pageCount, Integer userId);
+    PageUtils<pendingOrderVo> queryPendingOrder(int currentPage, int pageCount);
 
 
     TeamWorkCountVo queryTeamWorkCount(Integer schoolId, String dateNow);
     TeamWorkCountVo queryTeamWorkCount(Integer schoolId, String dateNow);
 
 
@@ -79,4 +79,17 @@ public interface RepairRecordService extends IService<RepairRecord> {
     MasterHomepageVo queryMasterHomeCount(Integer userId);
     MasterHomepageVo queryMasterHomeCount(Integer userId);
 
 
     MasterHomepageVo queryLogisticHomeCount(Integer schoolId);
     MasterHomepageVo queryLogisticHomeCount(Integer schoolId);
+    
+	List<RepairCampusVo> repairCampusTotal();
+
+    List<RepairCampusVo> repairCampus(String startTime, String endTime);
+
+    List<RepairAreaVo> repairAreaTotal();
+
+    List<RepairAreaVo> repairArea(String startTime, String endTime);
+
+    List<MaintenanceGoodsVo> maintenanceGoodsTotal();
+
+
+    List<MaintenanceGoodsVo> maintenanceGoods(String startTime, String endTime);
 }
 }

+ 9 - 0
src/main/java/com/repair/services/RepairSystemMessagesService.java

@@ -1,9 +1,13 @@
 package com.repair.services;
 package com.repair.services;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.repair.model.pojo.RepairLeaveMessage;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.repair.model.result.PageUtils;
 import com.repair.model.result.PageUtils;
+import com.repair.model.vo.SystemMessagePageVo;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -27,4 +31,9 @@ public interface RepairSystemMessagesService extends IService<RepairSystemMessag
     RepairSystemMessages getRepairById(int id);
     RepairSystemMessages getRepairById(int id);
 
 
     List<RepairSystemMessages> getRepairs();
     List<RepairSystemMessages> getRepairs();
+
+    boolean inserBatchSystemMessage(List<RepairSystemMessages> datas);
+
+    PageUtils<SystemMessagePageVo> querySystemMessagePage(int currentPage, int pageCount, Integer userId);
+
 }
 }

+ 1 - 0
src/main/java/com/repair/services/RepairUserService.java

@@ -58,5 +58,6 @@ public interface RepairUserService extends IService<RepairUser> {
 
 
     PageUtils<PositiveReviewVo> queryPositiveReviewPage(int currentPage, int pageCount, Integer schoolId);
     PageUtils<PositiveReviewVo> queryPositiveReviewPage(int currentPage, int pageCount, Integer schoolId);
 
 
+    List<AutoDispatchUserVo> dropDown(Integer buildId, Integer articleId, Integer schoolId);
 }
 }
 
 

+ 8 - 0
src/main/java/com/repair/services/impl/RepairDispatchRecordServiceImpl.java

@@ -125,4 +125,12 @@ public class RepairDispatchRecordServiceImpl extends ServiceImpl<RepairDispatchR
         return list;
         return list;
     }
     }
 
 
+    @Override
+    public int updateDispatch(Integer recordId, RepairDispatchRecord rdr) {
+        QueryWrapper<RepairDispatchRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("record_id",recordId);
+        int result = repairDispatchRecordMapper.update(rdr,queryWrapper);
+        return result;
+    }
+
 }
 }

+ 24 - 1
src/main/java/com/repair/services/impl/RepairEvaluateServiceImpl.java

@@ -1,5 +1,6 @@
 package com.repair.services.impl;
 package com.repair.services.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.repair.common.utils.TimeExchange;
 import com.repair.common.utils.TimeExchange;
@@ -7,9 +8,11 @@ import com.repair.model.pojo.RepairEvaluate;
 import com.repair.mapper.RepairEvaluateMapper;
 import com.repair.mapper.RepairEvaluateMapper;
 import com.repair.model.result.PageUtils;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.EvaluateVo;
 import com.repair.model.vo.EvaluateVo;
+import com.repair.model.vo.RecordEvaluateVo;
 import com.repair.model.vo.RepairConsumeVo;
 import com.repair.model.vo.RepairConsumeVo;
 import com.repair.services.RepairEvaluateService;
 import com.repair.services.RepairEvaluateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.math3.ml.neuralnet.twod.util.QuantizationError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -58,14 +61,34 @@ public class RepairEvaluateServiceImpl extends ServiceImpl<RepairEvaluateMapper,
     }
     }
 
 
     @Override
     @Override
-    public RepairEvaluate getRepairById(String id) {
+    public RepairEvaluate getRepairById(int id) {
         RepairEvaluate result = repairEvaluateMapper.selectById(id);
         RepairEvaluate result = repairEvaluateMapper.selectById(id);
         return result;
         return result;
     }
     }
 
 
     @Override
     @Override
+    public RepairEvaluate getRepairByRecordId(int recordId) {
+        QueryWrapper<RepairEvaluate> query = new QueryWrapper();
+        query.eq("record_id", recordId);
+        RepairEvaluate result = repairEvaluateMapper.selectOne(query);
+        return result;
+    }
+
+    @Override
     public List<EvaluateVo> queryEvaluateList(String keyWord, String startTime, String endTime) {
     public List<EvaluateVo> queryEvaluateList(String keyWord, String startTime, String endTime) {
         List<EvaluateVo> datas = repairEvaluateMapper.queryEvaluatePageList(keyWord,startTime,endTime);
         List<EvaluateVo> datas = repairEvaluateMapper.queryEvaluatePageList(keyWord,startTime,endTime);
         return datas;
         return datas;
     }
     }
+
+    @Override
+    public List<RecordEvaluateVo> queryEvaluateList(String dateStr) {
+        List<RecordEvaluateVo> result = repairEvaluateMapper.queryEvaluateList(dateStr);
+        return result;
+    }
+
+    @Override
+    public boolean inserBatchEvaluate(List<RepairEvaluate> datas) {
+        boolean result = this.saveBatch(datas);
+        return result;
+    }
 }
 }

+ 9 - 0
src/main/java/com/repair/services/impl/RepairReceivingServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.repair.model.enumModel.eDispatchResult;
 import com.repair.model.enumModel.eDispatchResult;
+import com.repair.model.pojo.RepairDispatchRecord;
 import com.repair.model.pojo.RepairReceiving;
 import com.repair.model.pojo.RepairReceiving;
 import com.repair.mapper.RepairReceivingMapper;
 import com.repair.mapper.RepairReceivingMapper;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.pojo.RepairRecord;
@@ -93,4 +94,12 @@ public class RepairReceivingServiceImpl extends ServiceImpl<RepairReceivingMappe
 
 
         return list;
         return list;
     }
     }
+
+    @Override
+    public int updateReceiving(Integer recordId, RepairReceiving rdr) {
+        QueryWrapper<RepairReceiving> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("record_id",recordId);
+        int result = repairReceivingMapper.update(rdr,queryWrapper);
+        return result;
+    }
 }
 }

+ 37 - 2
src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java

@@ -157,11 +157,11 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
     }
     }
 
 
     @Override
     @Override
-    public PageUtils<pendingOrderVo> queryPendingOrder(int currentPage, int pageCount, Integer userId) {
+    public PageUtils<pendingOrderVo> queryPendingOrder(int currentPage, int pageCount) {
         Page<pendingOrderVo> page = new Page<>();
         Page<pendingOrderVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setCurrent(currentPage);
         page.setSize(pageCount);
         page.setSize(pageCount);
-        IPage<pendingOrderVo> result = repairRecordMapper.queryPendingOrder(page, userId);
+        IPage<pendingOrderVo> result = repairRecordMapper.queryPendingOrder(page);
         return new PageUtils(result);
         return new PageUtils(result);
     }
     }
 
 
@@ -266,4 +266,39 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
         return result;
         return result;
     }
     }
 
 
+@Override
+    public List<RepairCampusVo> repairCampusTotal() {
+        List<RepairCampusVo> campusVoList = repairRecordMapper.repairCampusTotal();
+        return campusVoList;
+    }
+
+    @Override
+    public List<RepairCampusVo> repairCampus(String startTime, String endTime) {
+        List<RepairCampusVo> campusVoList = repairRecordMapper.repairCampus(startTime, endTime);
+        return campusVoList;
+    }
+
+    @Override
+    public List<RepairAreaVo> repairAreaTotal() {
+        List<RepairAreaVo> vos = repairRecordMapper.repairAreaTotal();
+        return vos;
+    }
+
+    @Override
+    public List<RepairAreaVo> repairArea(String startTime, String endTime) {
+        List<RepairAreaVo> vos = repairRecordMapper.repairArea(startTime, endTime);
+        return vos;
+    }
+
+    @Override
+    public List<MaintenanceGoodsVo> maintenanceGoodsTotal() {
+        List<MaintenanceGoodsVo> vos = repairRecordMapper.maintenanceGoodsTotal();
+        return vos;
+    }
+
+    @Override
+    public List<MaintenanceGoodsVo> maintenanceGoods(String startTime, String endTime) {
+        List<MaintenanceGoodsVo> vos = repairRecordMapper.maintenanceGoods(startTime,endTime);
+        return vos;
+    }
 }
 }

+ 24 - 1
src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java

@@ -3,20 +3,28 @@ package com.repair.services.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.repair.common.utils.TimeExchange;
+import com.repair.model.pojo.RepairEvaluate;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.model.pojo.RepairSystemMessages;
 import com.repair.mapper.RepairSystemMessagesMapper;
 import com.repair.mapper.RepairSystemMessagesMapper;
 import com.repair.model.result.PageUtils;
 import com.repair.model.result.PageUtils;
+import com.repair.model.vo.RecordEvaluateVo;
+import com.repair.model.vo.RepairTechnicianVo;
+import com.repair.model.vo.SystemMessagePageVo;
+import com.repair.services.RepairEvaluateService;
 import com.repair.services.RepairSystemMessagesService;
 import com.repair.services.RepairSystemMessagesService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
  * <p>
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  * </p>
  *
  *
  * @author ceshi
  * @author ceshi
@@ -65,4 +73,19 @@ public class RepairSystemMessagesServiceImpl extends ServiceImpl<RepairSystemMes
         List<RepairSystemMessages> result = repairSystemMessagesMapper.selectList(null);
         List<RepairSystemMessages> result = repairSystemMessagesMapper.selectList(null);
         return result;
         return result;
     }
     }
+
+    @Override
+    public boolean inserBatchSystemMessage(List<RepairSystemMessages> datas) {
+        boolean result = this.saveBatch(datas);
+        return result;
+    }
+
+    @Override
+    public PageUtils<SystemMessagePageVo> querySystemMessagePage(int currentPage, int pageCount, Integer userId) {
+        Page<SystemMessagePageVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<SystemMessagePageVo> result = repairSystemMessagesMapper.querySystemMessagePage(page, userId);
+        return new PageUtils(result);
+    }
 }
 }

+ 8 - 0
src/main/java/com/repair/services/impl/RepairUserServiceImpl.java

@@ -197,4 +197,12 @@ public class RepairUserServiceImpl extends ServiceImpl<RepairUserMapper, RepairU
         IPage<PositiveReviewVo> result = repairUserMapper.queryPositiveReviewPage(page, schoolId);
         IPage<PositiveReviewVo> result = repairUserMapper.queryPositiveReviewPage(page, schoolId);
         return new PageUtils(result);
         return new PageUtils(result);
     }
     }
+
+ @Override
+    public List<AutoDispatchUserVo> dropDown(Integer buildId, Integer articleId, Integer schoolId) {
+
+        List<AutoDispatchUserVo> vos=repairUserMapper.dropDown(buildId,articleId,schoolId);
+        return vos;
+    }
+
 }
 }

+ 2 - 2
src/main/resources/application-prod.yml

@@ -37,9 +37,9 @@ spring:
   # \u914D\u7F6E\u65E5\u5FD7
   # \u914D\u7F6E\u65E5\u5FD7
 mybatis-plus:
 mybatis-plus:
   mapper-locations: classpath:/mapper/repair/*.xml
   mapper-locations: classpath:/mapper/repair/*.xml
-#  configuration:
+  configuration:
 #    #开启sql打印
 #    #开启sql打印
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #    #关闭sql打印
 #    #关闭sql打印
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
   global-config:

+ 1 - 1
src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 
 
 spring:
 spring:
   profiles:
   profiles:
-      active: prod
+      active: dev
   main:
   main:
     allow-circular-references: true
     allow-circular-references: true
   datasource:
   datasource:

+ 2 - 1
src/main/resources/mapper/repair/RepairCollaborateRecordMapper.xml

@@ -37,10 +37,11 @@
         <result property="userName" column="user_name"/>
         <result property="userName" column="user_name"/>
         <result property="collaboratorName" column="collaborator_name"/>
         <result property="collaboratorName" column="collaborator_name"/>
         <result property="voice" column="voice"/>
         <result property="voice" column="voice"/>
+        <result property="voiceLength" column="voice_length"/>
         <result property="remark" column="remark"/>
         <result property="remark" column="remark"/>
     </resultMap>
     </resultMap>
     <select id="queryCollaborateDetail" resultType="com.repair.model.vo.CollaborateDetailVo" resultMap="repairCollaborateDetailMap">
     <select id="queryCollaborateDetail" resultType="com.repair.model.vo.CollaborateDetailVo" resultMap="repairCollaborateDetailMap">
-        select rcr.id,rus.user_name,GROUP_CONCAT(CONCAT(ru.id,'-',ru.user_name)) as collaborator_name,rcr.voice,rcr.remark from repair_collaborate_record rcr
+        select rcr.id,rcr.voice_length,rus.user_name,GROUP_CONCAT(CONCAT(ru.id,'-',ru.user_name)) as collaborator_name,rcr.voice,rcr.remark from repair_collaborate_record rcr
         left join repair_user ru on ru.deleted = 0 and find_in_set(ru.id,rcr.collaborator)
         left join repair_user ru on ru.deleted = 0 and find_in_set(ru.id,rcr.collaborator)
         left join repair_user rus on rus.deleted = 0 and rus.id = rcr.user_id
         left join repair_user rus on rus.deleted = 0 and rus.id = rcr.user_id
         where rcr.deleted = 0 and rcr.approval_statu = 2 and rcr.record_id = #{recordId}
         where rcr.deleted = 0 and rcr.approval_statu = 2 and rcr.record_id = #{recordId}

+ 2 - 1
src/main/resources/mapper/repair/RepairDispatchRecordMapper.xml

@@ -2,11 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.repair.mapper.RepairDispatchRecordMapper">
 <mapper namespace="com.repair.mapper.RepairDispatchRecordMapper">
     <resultMap type="com.repair.model.vo.RepairCardNumberVo" id="repairCardNumberMap">
     <resultMap type="com.repair.model.vo.RepairCardNumberVo" id="repairCardNumberMap">
+        <result property="userId" column="users_id"/>
         <result property="cardNumber" column="card_number"/>
         <result property="cardNumber" column="card_number"/>
     </resultMap>
     </resultMap>
 
 
     <select id="queryRepairCardNumber" resultType="com.repair.model.vo.RepairCardNumberVo" resultMap="repairCardNumberMap">
     <select id="queryRepairCardNumber" resultType="com.repair.model.vo.RepairCardNumberVo" resultMap="repairCardNumberMap">
-        SELECT ru.card_number FROM repair_dispatch_record rdr
+        SELECT ru.card_number,rdr.users_id FROM repair_dispatch_record rdr
         left join repair_user ru on ru.deleted = 0 and ru.id = rdr.users_id
         left join repair_user ru on ru.deleted = 0 and ru.id = rdr.users_id
         <where>
         <where>
             and rdr.deleted = 0 and rdr.is_lose_efficacy = 0
             and rdr.deleted = 0 and rdr.is_lose_efficacy = 0

+ 12 - 0
src/main/resources/mapper/repair/RepairEvaluateMapper.xml

@@ -31,4 +31,16 @@
         </where>
         </where>
         order by re.create_time desc
         order by re.create_time desc
     </select>
     </select>
+
+    <resultMap type="com.repair.model.vo.RecordEvaluateVo" id="repairRecordEvaluateMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="maintenancerId" column="maintenancer_id"/>
+    </resultMap>
+    <!--当前时间-24小时-->
+    <select id="queryEvaluateList" resultType="com.repair.model.vo.RecordEvaluateVo" resultMap="repairRecordEvaluateMap">
+        SELECT rr.id,rr.user_id,rr.maintenancer_id FROM repair_record rr
+        where rr.deleted = 0 and rr.maintenance_state = 7 and rr.update_time &lt;= #{dateStr}
+        and NOT EXISTS (select id from repair_evaluate where deleted = 0 and record_id = rr.id)
+    </select>
 </mapper>
 </mapper>

+ 194 - 3
src/main/resources/mapper/repair/RepairRecordMapper.xml

@@ -248,6 +248,7 @@
     <resultMap type="com.repair.model.vo.RepairRecordPageVo" id="repairRecordPageMap">
     <resultMap type="com.repair.model.vo.RepairRecordPageVo" id="repairRecordPageMap">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="recordNo" column="record_no"/>
         <result property="recordNo" column="record_no"/>
+        <result property="schoolId" column="school_id"/>
         <result property="userName" column="user_name"/>
         <result property="userName" column="user_name"/>
         <result property="userPhone" column="user_phone"/>
         <result property="userPhone" column="user_phone"/>
         <result property="articleName" column="article_name"/>
         <result property="articleName" column="article_name"/>
@@ -261,7 +262,7 @@
 
 
     <!--除已超时外的其他数据获取方式-->
     <!--除已超时外的其他数据获取方式-->
     <select id="queryNotTimeout" resultType="com.repair.model.vo.RepairRecordPageVo" resultMap="repairRecordPageMap">
     <select id="queryNotTimeout" resultType="com.repair.model.vo.RepairRecordPageVo" resultMap="repairRecordPageMap">
-        select rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id as area_name,rr.user_name,rr.user_phone,rat.name as
+        select rr.school_id,rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id as area_name,rr.user_name,rr.user_phone,rat.name as
         article_name,
         article_name,
         rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state
         rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state
         from repair_record rr
         from repair_record rr
@@ -288,7 +289,7 @@
     <!--#已超时获取方式-->
     <!--#已超时获取方式-->
     <select id="queryTimeout" resultType="com.repair.model.vo.RepairRecordPageVo" resultMap="repairRecordPageMap">
     <select id="queryTimeout" resultType="com.repair.model.vo.RepairRecordPageVo" resultMap="repairRecordPageMap">
         SELECT * FROM (
         SELECT * FROM (
-        select rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id as
+        select rr3.school_id,rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id as
         area_name,rr3.user_name,rr3.user_phone,rat.name as article_name,
         area_name,rr3.user_name,rr3.user_phone,rat.name as article_name,
         rr3.description,rr3.report_time,rr3.maintenancer_name,rr3.maintenance_state
         rr3.description,rr3.report_time,rr3.maintenancer_name,rr3.maintenance_state
         from repair_record rr3
         from repair_record rr3
@@ -353,7 +354,7 @@
     </resultMap>
     </resultMap>
 
 
     <select id="queryPendingOrder" resultType="com.repair.model.vo.pendingOrderVo" resultMap="repairPendingOrderMap">
     <select id="queryPendingOrder" resultType="com.repair.model.vo.pendingOrderVo" resultMap="repairPendingOrderMap">
-        select * from (select (select Count(*) from repair_dispatch_record where is_lose_efficacy = 0 and record_id = rr.id and receiving_time is null and users_id = #{userId}) as disp_count,rr.id,rr.record_no,
+        select * from (select (select Count(*) from repair_dispatch_record where is_lose_efficacy = 0 and record_id = rr.id and receiving_time is null) as disp_count,rr.id,rr.record_no,
         rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name,rr.description,rr.image,'待接单' as state
         rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name,rr.description,rr.image,'待接单' as state
         from repair_record rr
         from repair_record rr
         left join repair_article_type rat on rat.id = rr.article_id
         left join repair_article_type rat on rat.id = rr.article_id
@@ -668,4 +669,194 @@
         and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time)
         and ((date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW() and rdv.maintenance_assess_time is null) or date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= rdv.finish_time)
         where rr4.is_duty = 0 and rr4.deleted = 0 and rr4.school_id = #{schoolId}) c) as timeout_count
         where rr4.is_duty = 0 and rr4.deleted = 0 and rr4.school_id = #{schoolId}) c) as timeout_count
     </select>
     </select>
+
+<select id="repairCampusTotal" resultType="com.repair.model.vo.RepairCampusVo">
+        SELECT rs.id,
+               count(rr.school_id) as orders_total,
+               rs.`name`           as school_name,
+               (SELECT COUNT(school_id)
+                FROM `repair_record`
+                WHERE price > 0
+                  AND rs.id = school_id
+                  AND deleted = 0) AS orders_compensation,
+               (SELECT COUNT(school_id)
+                FROM `repair_record`
+                WHERE (price IS NULL OR price = 0)
+                  AND rs.id = school_id
+                  AND deleted = 0) AS orders_gratis,
+               SUM(rr.price)       AS total_price
+        FROM `repair_record` rr
+                 LEFT JOIN repair_school rs ON rs.deleted = 0
+            AND rr.school_id = rs.id
+            AND rr.deleted = 0
+        GROUP BY rr.school_id
+    </select>
+    <select id="repairCampus" resultType="com.repair.model.vo.RepairCampusVo">
+        SELECT
+        rs.id,
+        count( rr.school_id ) as orders_total,
+        rs.`name` as school_name,
+        (
+        SELECT
+        COUNT( school_id )
+        FROM
+        `repair_record`
+        <where>
+            and price > 0
+            AND rs.id = school_id
+            AND deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        ) AS orders_compensation,
+        (
+        SELECT
+        COUNT( school_id )
+        FROM
+        `repair_record`
+        <where>
+            and ( price IS NULL OR price = 0 )
+            AND rs.id = school_id
+            AND deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        ) AS orders_gratis,
+        SUM( rr.price ) AS total_price
+        FROM
+        `repair_record` rr
+        LEFT JOIN repair_school rs ON rs.deleted = 0
+        AND rr.school_id = rs.id
+        <where>
+            AND rr.deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        GROUP BY
+        rr.school_id
+    </select>
+
+    <select id="repairAreaTotal" resultType="com.repair.model.vo.RepairAreaVo">
+        SELECT row_number() over ( ORDER BY ra.area_name ) AS id, ra.*
+        FROM (SELECT count(rr.area_id)   AS orders_total,
+                     rs.`name`           AS school_name,
+                     rr.area_id          AS area_name,
+                     (SELECT COUNT(area_id)
+                      FROM `repair_record`
+                      WHERE price > 0
+                        AND rr.area_id = area_id
+                        AND deleted = 0) AS orders_compensation,
+                     (SELECT COUNT(area_id)
+                      FROM `repair_record`
+                      WHERE (price IS NULL OR price = 0)
+                        AND rr.area_id = area_id
+                        AND deleted = 0) AS orders_gratis,
+                     SUM(rr.price)       AS total_price
+              FROM `repair_record` rr
+                       LEFT JOIN repair_school rs ON rs.deleted = 0
+                  AND rr.school_id = rs.id
+              where rr.deleted = 0
+              GROUP BY rr.area_id) ra
+    </select>
+
+    <select id="repairArea" resultType="com.repair.model.vo.RepairAreaVo">
+        SELECT row_number() over ( ORDER BY ra.area_name ) AS id, ra.*
+        FROM (SELECT count(rr.area_id) AS orders_total,
+        rs.`name` AS school_name,
+        rr.area_id AS area_name,
+        (SELECT COUNT(area_id)
+        FROM `repair_record`
+        <where>
+            AND price > 0
+            AND rr.area_id = area_id
+            AND deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        ) AS orders_compensation,
+        (SELECT COUNT(area_id)
+        FROM `repair_record`
+        <where>
+            AND (price IS NULL OR price = 0)
+            AND rr.area_id = area_id
+            AND deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        ) AS orders_gratis,
+        SUM(rr.price) AS total_price
+        FROM `repair_record` rr
+        LEFT JOIN repair_school rs ON rs.deleted = 0
+        AND rr.school_id = rs.id
+        <where>
+            AND rr.deleted=0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        GROUP BY rr.area_id) ra
+    </select>
+    <select id="maintenanceGoodsTotal" resultType="com.repair.model.vo.MaintenanceGoodsVo">
+        SELECT row_number() over ( ORDER BY wx.article_name ) AS id, wx.*
+        FROM (SELECT rat.`name`           AS article_name,
+                     count(rr.article_id) AS orders_total,
+                     (SELECT COUNT(article_id)
+                      FROM `repair_record`
+                      WHERE price > 0
+                        AND rr.article_id = article_id
+                        AND deleted = 0)  AS orders_compensation,
+                     (SELECT COUNT(article_id)
+                      FROM `repair_record`
+                      WHERE (price IS NULL OR price = 0)
+                        AND rr.article_id = article_id
+                        AND deleted = 0)  AS orders_gratis,
+                     SUM(rr.price)        AS total_price
+              FROM `repair_record` rr
+                       LEFT JOIN repair_article_type rat ON rat.deleted = 0
+                  AND rr.article_id = rat.id
+              WHERE rr.deleted = 0
+              GROUP BY rr.article_id) wx
+    </select>
+
+    <select id="maintenanceGoods" resultType="com.repair.model.vo.MaintenanceGoodsVo">
+        SELECT row_number() over ( ORDER BY wx.article_name ) AS id, wx.*
+        FROM (SELECT rat.`name` AS article_name,
+        count(rr.article_id) AS orders_total,
+        (SELECT COUNT(article_id)
+        FROM `repair_record`
+        <where>
+            and price > 0 AND rr.article_id = article_id AND deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        ) AS orders_compensation,
+        (SELECT COUNT(article_id)
+        FROM `repair_record`
+        <where>
+            and (price IS NULL OR price = 0)
+            AND rr.article_id = article_id
+            AND deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        ) AS orders_gratis,
+        SUM(rr.price) AS total_price
+        FROM `repair_record` rr
+        LEFT JOIN repair_article_type rat ON rat.deleted = 0
+        AND rr.article_id = rat.id
+        <where>
+            and rr.deleted = 0
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        GROUP BY rr.article_id) wx
+    </select>
 </mapper>
 </mapper>

+ 14 - 0
src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml

@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.repair.mapper.RepairSystemMessagesMapper">
 <mapper namespace="com.repair.mapper.RepairSystemMessagesMapper">
+    <resultMap type="com.repair.model.vo.SystemMessagePageVo" id="systemMessagePageMap">
+        <result property="id" column="id"/>
+        <result property="recordNo" column="record_no"/>
+        <result property="isRead" column="is_read"/>
+        <result property="content" column="content"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="querySystemMessagePage" resultType="com.repair.model.vo.SystemMessagePageVo" resultMap="systemMessagePageMap">
+        select rsm.id,rr.record_no,rsm.is_read,rsm.content,rsm.update_time from repair_system_messages rsm
+        left join repair_record rr on rr.deleted = 0 and rr.id = rsm.record_id
+        where rsm.deleted = 0 and rsm.recipient_id = #{userId}
+        order by rsm.update_time desc
+    </select>
 
 
 </mapper>
 </mapper>

+ 2 - 1
src/main/resources/mapper/repair/RepairTransferRecordMapper.xml

@@ -5,10 +5,11 @@
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="userName" column="user_name"/>
         <result property="userName" column="user_name"/>
         <result property="voice" column="voice"/>
         <result property="voice" column="voice"/>
+        <result property="voiceLength" column="voice_length"/>
         <result property="remark" column="remark"/>
         <result property="remark" column="remark"/>
     </resultMap>
     </resultMap>
     <select id="queryTransferDetail" resultType="com.repair.model.vo.TransferDetailVo" resultMap="repairTransferDetailMap">
     <select id="queryTransferDetail" resultType="com.repair.model.vo.TransferDetailVo" resultMap="repairTransferDetailMap">
-        SELECT rtr.id,ru.user_name,rtr.voice,rtr.remark FROM repair_transfer_record rtr
+        SELECT rtr.id,rtr.voice_length,ru.user_name,rtr.voice,rtr.remark FROM repair_transfer_record rtr
         left join repair_user ru on ru.deleted = 0 and ru.id = rtr.user_id
         left join repair_user ru on ru.deleted = 0 and ru.id = rtr.user_id
         where rtr.deleted = 0 and rtr.approval_statu = 2 and rtr.record_id = #{recordId}
         where rtr.deleted = 0 and rtr.approval_statu = 2 and rtr.record_id = #{recordId}
     </select>
     </select>

+ 11 - 0
src/main/resources/mapper/repair/RepairUserMapper.xml

@@ -192,4 +192,15 @@
         from repair_user ru
         from repair_user ru
         where ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.school_id = #{schoolId}
         where ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.school_id = #{schoolId}
     </select>
     </select>
+    
+    <select id="dropDown" resultType="com.repair.model.vo.AutoDispatchUserVo">
+        select * from (
+        select wt.name as work_type,'大量接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0  and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
+        inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id
+        left join repair_article_type rat on rat.deleted = 0 and (FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
+        left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
+        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1
+        group by ru.id) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
+        order by t.rdr_count
+    </select>
 </mapper>
 </mapper>

+ 0 - 72
target/classes/META-INF/spring-configuration-metadata.json

@@ -1,72 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "openid",
-      "type": "com.repair.config.WxOpenidConfig",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "tencentcloud",
-      "type": "com.repair.config.SmsConfig",
-      "sourceType": "com.repair.config.SmsConfig"
-    }
-  ],
-  "properties": [
-    {
-      "name": "openid.appid",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.appkey",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.granttype",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.ipconfig",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "openid.ocode",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.WxOpenidConfig"
-    },
-    {
-      "name": "tencentcloud.sdk-appid",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.secret-i-d",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.secret-key",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.sign-name",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.sms-min",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    },
-    {
-      "name": "tencentcloud.template-id",
-      "type": "java.lang.String",
-      "sourceType": "com.repair.config.SmsConfig"
-    }
-  ],
-  "hints": []
-}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 69
target/classes/application-dev.yml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 70
target/classes/application-prod.yml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 67
target/classes/application.yml


BIN
target/classes/excelFile/耗材管理模板.xlsx


BIN
target/classes/excelFile/自定义排班模板.xlsx


+ 0 - 5
target/classes/mapper/repair/RepairAdminMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairAdminMapper">
-
-</mapper>

+ 0 - 14
target/classes/mapper/repair/RepairAreaMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairAreaMapper">
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.RepairSchoolVo" id="repairSchoolMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-    </resultMap>
-
-    <select id="queryRepairSchools" resultMap="repairSchoolMap">
-        select id,name from repair_area where parent_id = 0 and deleted = 0
-    </select>
-
-</mapper>

+ 0 - 36
target/classes/mapper/repair/RepairArticleTypeMapper.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairArticleTypeMapper">
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="repairArticleTypeMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-    </resultMap>
-
-    <select id="queryArticleTypeList" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="repairArticleTypeMap">
-       select id,name from repair_article_type
-        <where>
-            and deleted = 0 and parent_id = 0
-            <if test="schoolId != null and schoolId != ''">
-                and school_id = #{schoolId}
-            </if>
-        </where>
-    </select>
-
-
-    <resultMap type="com.repair.model.vo.RepairArticleChildVo" id="repairArticleChildMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-        <result property="childId" column="child_id"/>
-    </resultMap>
-
-    <select id="queryArticleChildList" resultType="com.repair.model.vo.RepairArticleChildVo" resultMap="repairArticleChildMap">
-        SELECT CONCAT_WS(',', GROUP_CONCAT(rt.id separator','), rat.id) as child_id,rat.id,rat.`name` FROM repair_article_type rat
-        left join repair_article_type rt on rt.deleted = 0 and rt.parent_id = rat.id
-        where rat.deleted = 0 and rat.parent_id = 0 and rat.school_id = #{schoolId}
-        group by rat.id
-
-    </select>
-    <!--order by locate(#{keyWord},rat.name) desc 按关键字模糊查询排序-->
-
-</mapper>

+ 0 - 68
target/classes/mapper/repair/RepairClassesSettingsMapper.xml

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairClassesSettingsMapper">
-
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.ClassesSettingVo" id="repairClassesListMap">
-        <result property="id" column="id"/>
-        <result property="userId" column="user_id"/>
-        <result property="startDate" column="start_date"/>
-        <result property="shiftId" column="shift_id"/>
-        <result property="shiftName" column="shift_name"/>
-        <result property="shiftColor" column="shift_color"/>
-    </resultMap>
-
-    <select id="queryClassesSettingList" resultType="com.repair.model.vo.ClassesSettingVo" resultMap="repairClassesListMap">
-        SELECT rcs.id,rcs.user_id,rcs.start_date,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
-        ,(select GROUP_CONCAT(color) from repair_shift_settings where find_in_set(id,rcs.shift_id) and deleted = 0) as shift_color
-        FROM repair_classes_settings rcs
-        <where>
-            and rcs.deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rcs.start_date BETWEEN #{startTime} and #{endTime}
-            </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>
-
-    <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>

+ 0 - 5
target/classes/mapper/repair/RepairCloseMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairCloseMapper">
-
-</mapper>

+ 0 - 49
target/classes/mapper/repair/RepairCollaborateRecordMapper.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairCollaborateRecordMapper">
-
-    <resultMap type="com.repair.model.vo.CollaborateRecordVo" id="repairCollaborateRecordMap">
-        <result property="id" column="id"/>
-        <result property="recordId" column="record_id"/>
-        <result property="state" column="state"/>
-    </resultMap>
-
-    <select id="queryCollaborateRecordList" resultType="com.repair.model.vo.CollaborateRecordVo" resultMap="repairCollaborateRecordMap">
-        select id,record_id,'转单' as state from repair_transfer_record
-        <where>
-            and deleted = 0 and approval_statu = 2
-            <if test="recordIds != null and recordIds.size() > 0">
-                and record_id in
-                <foreach collection="recordIds" item="recordId" index="index" open="(" close=")" separator=",">
-                    ${recordId}
-                </foreach>
-            </if>
-        </where>
-        UNION ALL
-        select id,record_id,'协作' as state from repair_collaborate_record
-        <where>
-            and deleted = 0 and approval_statu = 2
-            <if test="recordIds != null and recordIds.size() > 0">
-                and record_id in
-                <foreach collection="recordIds" item="recordId" index="index" open="(" close=")" separator=",">
-                    ${recordId}
-                </foreach>
-            </if>
-        </where>
-    </select>
-
-    <resultMap type="com.repair.model.vo.CollaborateDetailVo" id="repairCollaborateDetailMap">
-        <result property="id" column="id"/>
-        <result property="userName" column="user_name"/>
-        <result property="collaboratorName" column="collaborator_name"/>
-        <result property="voice" column="voice"/>
-        <result property="remark" column="remark"/>
-    </resultMap>
-    <select id="queryCollaborateDetail" resultType="com.repair.model.vo.CollaborateDetailVo" resultMap="repairCollaborateDetailMap">
-        select rcr.id,rus.user_name,GROUP_CONCAT(CONCAT(ru.id,'-',ru.user_name)) as collaborator_name,rcr.voice,rcr.remark from repair_collaborate_record rcr
-        left join repair_user ru on ru.deleted = 0 and find_in_set(ru.id,rcr.collaborator)
-        left join repair_user rus on rus.deleted = 0 and rus.id = rcr.user_id
-        where rcr.deleted = 0 and rcr.approval_statu = 2 and rcr.record_id = #{recordId}
-        group by rcr.id
-    </select>
-</mapper>

+ 0 - 82
target/classes/mapper/repair/RepairConsumablesMapper.xml

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairConsumablesMapper">
-
-    <resultMap type="com.repair.model.vo.ConsumablePageVo" id="repairConsumablePageMap">
-        <result property="id" column="id"/>
-        <result property="consumeName" column="consume_name"/>
-        <result property="price" column="price"/>
-        <result property="number" column="number"/>
-        <result property="totalPrice" column="total_price"/>
-        <result property="articleName" column="article_name"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-    <select id="queryConsumablePageList" resultType="com.repair.model.vo.ConsumablePageVo" resultMap="repairConsumablePageMap">
-        select rcs.id,rcs.consume_name,rcs.price,rcs.number,rcs.total_price,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted = 0) as article_name
-        ,rr.record_no,rr.report_time,rcs.update_time from repair_consumables rcs
-        left join repair_consume rc on rc.deleted = 0 and rc.id = rcs.consume_id
-        left join repair_record rr on rr.deleted = 0 and rr.id = rcs.record_id
-        <where>
-            and rcs.deleted = 0
-            <if test="keyWord != null and keyWord != ''">
-                and (rcs.consume_name like '%' #{keyWord} '%' or rr.record_no like '%' #{keyWord} '%')
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rcs.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-        order by rr.report_time desc,rcs.update_time desc
-    </select>
-
-    <resultMap type="com.repair.model.vo.ConsumableExcelVo" id="repairConsumableExcelMap">
-        <result property="id" column="id"/>
-        <result property="consumeName" column="consume_name"/>
-        <result property="price" column="price"/>
-        <result property="number" column="number"/>
-        <result property="totalPrice" column="total_price"/>
-        <result property="articleName" column="article_name"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-    <select id="queryConsumableExcelList" resultType="com.repair.model.vo.ConsumableExcelVo" resultMap="repairConsumableExcelMap">
-        select rcs.id,rcs.consume_name,rcs.price,rcs.number,rcs.total_price,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted = 0) as article_name
-        ,rr.record_no,rr.report_time,rcs.update_time from repair_consumables rcs
-        left join repair_consume rc on rc.deleted = 0 and rc.id = rcs.consume_id
-        left join repair_record rr on rr.deleted = 0 and rr.id = rcs.record_id
-        <where>
-            and rcs.deleted = 0
-            <if test="keyWord != null and keyWord != ''">
-                and (rcs.consume_name like '%' #{keyWord} '%' or rr.record_no like '%' #{keyWord} '%')
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rcs.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-        order by rr.report_time desc,rcs.update_time desc
-    </select>
-
-    <resultMap type="com.repair.model.vo.ChangeConsumesVo" id="repairChangeConsumesMap">
-        <result property="id" column="id"/>
-        <result property="articleId" column="article_id"/>
-        <result property="consumeId" column="consume_id"/>
-        <result property="consumeName" column="consume_name"/>
-        <result property="price" column="price"/>
-        <result property="number" column="number"/>
-    </resultMap>
-    <select id="repairChangeConsumes" resultType="com.repair.model.vo.ChangeConsumesVo" resultMap="repairChangeConsumesMap">
-        select id,article_id,consume_id,consume_name,price,number from repair_consumables
-        <where>
-            and deleted = 0
-            <if test="recordId != null and recordId != ''">
-                and record_id = #{recordId}
-            </if>
-        </where>
-        order by update_time desc
-    </select>
-
-</mapper>

+ 0 - 91
target/classes/mapper/repair/RepairConsumeMapper.xml

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairConsumeMapper">
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.ConsumeVo" id="repairConsumeMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-        <result property="price" column="price"/>
-        <result property="schoolName" column="school_name"/>
-        <result property="artileName" column="artile_name"/>
-        <result property="entryName" column="entry_name"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-    <select id="queryConsumeList" resultType="com.repair.model.vo.ConsumeVo" resultMap="repairConsumeMap">
-       SELECT rc.id,rc.name,rc.price,rae.name as school_name,ra.username as entry_name,ra.update_time ,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id) and deleted) as artile_name FROM `repair_consume` rc
-        left join repair_admin ra on ra.id = rc.update_user and ra.deleted = 0
-        left join repair_area rae on rae.id = rc.school_id and rae.deleted = 0
-        <where>
-            and rc.deleted = 0
-            <if test="name != null and name != ''">
-                and rc.name like '%' #{name} '%'
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rc.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-    </select>
-
-    <resultMap type="com.repair.model.vo.RepairConsumeVo" id="repairConsumePageMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-        <result property="content" column="content"/>
-        <result property="price" column="price"/>
-        <result property="articleId" column="article_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="articleName" column="article_name"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="schoolId" column="school_id"/>
-    </resultMap>
-
-    <select id="queryConsumePageList" resultType="com.repair.model.vo.RepairConsumeVo" resultMap="repairConsumePageMap">
-        select rc.school_id,rc.update_time,rc.id,rc.name,rc.content,rc.price,rc.article_id,ra.username as user_name,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,rc.article_id)) as article_name from repair_consume rc
-        left join repair_admin ra on rc.update_user = ra.id and ra.deleted = 0
-        <where>
-            and rc.deleted = 0
-            <if test="name != null and name != ''">
-                and rc.name like '%' #{name} '%'
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rc.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-    </select>
-
-
-    <resultMap type="com.repair.model.vo.RepairArticleConsumeVo" id="repairArticleConsumeMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-        <result property="articleId" column="article_id"/>
-        <result property="price" column="price"/>
-    </resultMap>
-
-    <select id="queryArticleConsumes" resultType="com.repair.model.vo.RepairArticleConsumeVo" resultMap="repairArticleConsumeMap">
-        select id,article_id,name,price from repair_consume
-        <where>
-            and deleted =0
-            <if test="schoolId != null and schoolId != ''">
-                and school_id = #{schoolId}
-            </if>
-            <if test="keyWork != null and keyWork != ''">
-                and name like '%' #{keyWork} '%'
-            </if>
-            <if test="findInSet != null and findInSet != ''">
-                and (${findInSet})
-            </if>
-        </where>
-    </select>
-    <select id="queryArticleConsumesName" resultType="com.repair.model.vo.RepairArticleConsumeVo">
-        select id,article_id,name,price from repair_consume
-        <where>
-        and deleted =0
-        <if test="schoolId != null and schoolId != ''">
-            and school_id = #{schoolId}
-        </if>
-        <if test="findInSet != null and findInSet != ''">
-            and (${findInSet})
-        </if>
-        </where>
-    </select>
-</mapper>

+ 0 - 20
target/classes/mapper/repair/RepairDispatchRecordMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairDispatchRecordMapper">
-    <resultMap type="com.repair.model.vo.RepairCardNumberVo" id="repairCardNumberMap">
-        <result property="cardNumber" column="card_number"/>
-    </resultMap>
-
-    <select id="queryRepairCardNumber" resultType="com.repair.model.vo.RepairCardNumberVo" resultMap="repairCardNumberMap">
-        SELECT ru.card_number FROM repair_dispatch_record rdr
-        left join repair_user ru on ru.deleted = 0 and ru.id = rdr.users_id
-        <where>
-            and rdr.deleted = 0 and rdr.is_lose_efficacy = 0
-            <if test="recordId != null and recordId != ''">
-                and rdr.record_id = #{recordId}
-            </if>
-        </where>
-    </select>
-
-
-</mapper>

+ 0 - 34
target/classes/mapper/repair/RepairEvaluateMapper.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairEvaluateMapper">
-
-    <resultMap type="com.repair.model.vo.EvaluateVo" id="repairEvaluatePageMap">
-        <result property="id" column="id"/>
-        <result property="recordNo" column="record_no"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="description" column="description"/>
-        <result property="reportTime" column="report_time"/>
-        <result property="maintenancerName" column="maintenancer_name"/>
-        <result property="star" column="star"/>
-        <result property="content" column="content"/>
-        <result property="createTime" column="create_time"/>
-    </resultMap>
-
-    <select id="queryEvaluatePageList" resultType="com.repair.model.vo.EvaluateVo" resultMap="repairEvaluatePageMap">
-        select
-        re.id,rr.record_no,rr.user_name,rr.user_phone,rr.description,rr.report_time,rr.maintenancer_name,re.star,re.content,re.create_time
-        from repair_evaluate re
-        left join repair_record rr on rr.id = re.record_id and rr.deleted = 0
-        <where>
-            and re.deleted = 0
-            <if test="keyWord != null and keyWord != ''">
-                and (rr.user_name like '%' #{keyWord} '%' or rr.record_no like '%' #{keyWord} '%')
-            </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and re.create_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-        order by re.create_time desc
-    </select>
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairLeaveMessageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairLeaveMessageMapper">
-
-</mapper>

+ 0 - 24
target/classes/mapper/repair/RepairNoticeSettingMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairNoticeSettingMapper">
-
-    <resultMap type="com.repair.model.vo.NoticePageVo" id="repairNoticePageMap">
-        <result property="id" column="id"/>
-        <result property="content" column="content"/>
-        <result property="userName" column="username"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="isTop" column="is_top"/>
-    </resultMap>
-
-    <select id="queryNoticePageList" resultType="com.repair.model.vo.NoticePageVo" resultMap="repairNoticePageMap">
-        SELECT rns.id,rns.content,ra.username,rns.update_time,rns.is_top FROM repair_notice_setting rns
-        left join repair_admin ra on ra.id = rns.update_user and ra.deleted = 0
-        <where>
-            and rns.deleted =0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and rns.update_time BETWEEN #{startTime} and #{endTime}
-            </if>
-        </where>
-        order by rns.update_time desc
-    </select>
-</mapper>

+ 0 - 19
target/classes/mapper/repair/RepairPayRecordMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairPayRecordMapper">
-    <resultMap type="com.repair.model.pojo.RepairPayRecord" id="repairPayMap">
-        <result property="id" column="id"/>
-        <result property="recordId" column="record_id"/>
-        <result property="userId" column="user_id"/>
-        <result property="payNo" column="pay_no"/>
-        <result property="payPrice" column="pay_price"/>
-        <result property="isSuccess" column="is_success"/>
-        <result property="remark" column="remark"/>
-    </resultMap>
-    <select id="queryPaymentData" resultType="com.repair.model.pojo.RepairPayRecord" resultMap="repairPayMap">
-        select rpr.id,rpr.record_id,rpr.user_id,rpr.pay_no,rpr.pay_price,rpr.is_success,rpr.remark from repair_pay_record rpr
-        inner join repair_record rr on rr.deleted = 0 and rr.record_no = #{recordNo} and rr.id = rpr.record_id
-        where rpr.deleted = 0
-    </select>
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairReceivingMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairReceivingMapper">
-
-</mapper>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 671
target/classes/mapper/repair/RepairRecordMapper.xml


+ 0 - 5
target/classes/mapper/repair/RepairRefundRecordMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairRefundRecordMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairSchoolMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairSchoolMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairShiftSettingsMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairShiftSettingsMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairSystemMessagesMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairSystemMessagesMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairSystemSettingMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairSystemSettingMapper">
-
-</mapper>

+ 0 - 5
target/classes/mapper/repair/RepairTrackRecordMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairTrackRecordMapper">
-
-</mapper>

+ 0 - 16
target/classes/mapper/repair/RepairTransferRecordMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairTransferRecordMapper">
-    <resultMap type="com.repair.model.vo.TransferDetailVo" id="repairTransferDetailMap">
-        <result property="id" column="id"/>
-        <result property="userName" column="user_name"/>
-        <result property="voice" column="voice"/>
-        <result property="remark" column="remark"/>
-    </resultMap>
-    <select id="queryTransferDetail" resultType="com.repair.model.vo.TransferDetailVo" resultMap="repairTransferDetailMap">
-        SELECT rtr.id,ru.user_name,rtr.voice,rtr.remark FROM repair_transfer_record rtr
-        left join repair_user ru on ru.deleted = 0 and ru.id = rtr.user_id
-        where rtr.deleted = 0 and rtr.approval_statu = 2 and rtr.record_id = #{recordId}
-    </select>
-
-</mapper>

+ 0 - 195
target/classes/mapper/repair/RepairUserMapper.xml

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairUserMapper">
-
-    <resultMap type="com.repair.model.vo.RepairUserVo" id="repairUserPageMap">
-        <result property="id" column="id"/>
-        <result property="cardNumber" column="card_number"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="teamId" column="team_id"/>
-        <result property="teamName" column="team_name"/>
-        <result property="schoolId" column="school_id"/>
-        <result property="schoolName" column="school_name"/>
-        <result property="userZzid" column="user_zzid"/>
-        <result property="userZzname" column="user_zzname"/>
-        <result property="buildId" column="build_id"/>
-        <result property="buildName" column="build_name"/>
-        <result property="articleId" column="article_id"/>
-        <result property="articleName" column="article_name"/>
-        <result property="workType" column="work_type"/>
-        <result property="workTypeName" column="work_type_name"/>
-        <result property="acceptanceTime" column="acceptance_assess_time"/>
-        <result property="maintenanceTime" column="maintenance_assess_time"/>
-    </resultMap>
-
-    <select id="queryUserPageList" resultType="com.repair.model.vo.RepairUserVo" resultMap="repairUserPageMap">
-        select ru.card_number,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.article_id,(select GROUP_CONCAT(name) from repair_article_type where find_in_set(id,ru.article_id)) as article_name,ru.user_name, ru.user_phone, ru.team_id, case ru.team_id when 0 then '校方人员' else '第三方人员' end as team_name, ru.school_id,ra.name as school_name,
-        ru.user_zzid,case ru.user_zzid when 3 then '后勤人员' else '维修师傅' end as user_zzname,ru.build_id,(select GROUP_CONCAT(name) from repair_area where find_in_set(id,ru.build_id)) as build_name,ru.work_type,rwt.name as work_type_name from repair_user ru
-        left join repair_area ra on ra.id = ru.school_id and ra.deleted = 0
-        left join repair_work_type rwt on rwt.id = ru.work_type and ra.deleted = 0
-        <where>
-            and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2 or ru.user_zzid = 3)
-            <if test="schoolId != null and schoolId != ''">
-                and ru.school_id = ${schoolId}
-            </if>
-            <if test="teamId != null and teamId != ''">
-                and ru.team_id = ${teamId}
-            </if>
-            <if test="keyWord != null and keyWord != ''">
-                and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%')
-            </if>
-        </where>
-    </select>
-
-    <resultMap type="com.repair.model.vo.RepairLogisticsVo" id="repairLogisticsMap">
-        <result property="id" column="id"/>
-    </resultMap>
-
-    <select id="queryLogisticsList" resultType="com.repair.model.vo.RepairLogisticsVo" resultMap="repairLogisticsMap">
-        select id from repair_user ru
-        where EXISTS (select id from repair_record where deleted = 0 and id = #{recordId} and school_id = ru.school_id)
-        and ru.user_zzid = 3 and ru.deleted = 0
-    </select>
-
-
-    <resultMap type="com.repair.model.vo.UserDataVo" id="userDataMap">
-        <result property="id" column="id"/>
-        <result property="state" column="state"/>
-        <result property="shiftId" column="shift_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="startDate" column="start_date"/>
-        <result property="articleId" column="article_id"/>
-        <result property="acceptanceAssessTime" column="acceptance_assess_time"/>
-        <result property="maintenanceAssessTime" column="maintenance_assess_time"/>
-    </resultMap>
-    <select id="queryUserData" resultType="com.repair.model.vo.UserDataVo" resultMap="userDataMap">
-        select ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.state,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
-        left join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = #{userId} and start_date = #{dateNow}
-        left join repair_article_type rat on rat.deleted = 0 and ( FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
-        where ru.id = #{userId} and ru.deleted = 0
-    </select>
-
-    <resultMap type="com.repair.model.vo.CollaboratorVo" id="collaboratorMap">
-        <result property="id" column="id"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="workTypeName" column="work_type_name"/>
-        <result property="state" column="state"/>
-    </resultMap>
-    <select id="queryCollaborator" resultType="com.repair.model.vo.CollaboratorVo" resultMap="collaboratorMap">
-        select ru.id,ru.user_name,ru.user_phone,rwt.name as work_type_name,ru.state
-        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="userId != null and userId != ''">
-                and ru.id != #{userId}
-            </if>
-            <if test="schoolId != null and schoolId != ''">
-                and ru.school_id = #{schoolId}
-            </if>
-            <if test="keyWord != null and keyWord != ''">
-                and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%' or rwt.name like '%' #{keyWord} '%')
-            </if>
-        </where>
-    </select>
-
-    <resultMap type="com.repair.model.vo.AddressBookVo" id="addressBookMap">
-        <result property="id" column="id"/>
-        <result property="teamId" column="team_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="workType" column="work_type"/>
-        <result property="workTypeName" column="work_type_name"/>
-        <result property="state" column="state"/>
-        <result property="acceptanceTime" column="acceptance_assess_time"/>
-        <result property="maintenanceTime" column="maintenance_assess_time"/>
-    </resultMap>
-    <select id="queryAddressBook" 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="userId != null and userId != ''">
-                and ru.id != #{userId}
-            </if>
-            <if test="schoolId != null and schoolId != ''">
-                and ru.school_id = #{schoolId}
-            </if>
-            <if test="keyWord != null and keyWord != ''">
-                and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%' or rwt.name like '%' #{keyWord} '%')
-            </if>
-        </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"/>
-        <result property="workType" column="work_type"/>
-        <result property="rdrCount" column="rdr_count"/>
-        <result property="buildId" column="build_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="acceptanceTime" column="acceptance_assess_time"/>
-        <result property="maintenanceTime" column="maintenance_assess_time"/>
-        <result property="startDate" column="start_date"/>
-        <result property="shiftId" column="shift_id"/>
-        <result property="articleId" column="article_id"/>
-    </resultMap>
-
-    <select id="autoDispatchUser" resultType="com.repair.model.vo.AutoDispatchUserVo" resultMap="AutoDispatchUserMap">
-        select * from (
-        select wt.name as work_type,'大量接单' as state,(select count(*) from repair_dispatch_record where deleted = 0 and is_lose_efficacy = 0 and assigned_time like '%' #{dateNow} '%' and users_id = ru.id) as rdr_count,ru.build_id,ru.user_phone,ru.acceptance_assess_time,ru.maintenance_assess_time,ru.id,ru.user_name,rcs.start_date,rcs.shift_id,GROUP_CONCAT(rat.id) as article_id from repair_user ru
-        inner join repair_classes_settings rcs on rcs.deleted = 0 and rcs.user_id = ru.id and start_date = #{dateNow}
-        left join repair_article_type rat on rat.deleted = 0 and (FIND_IN_SET(rat.id,ru.article_id) or FIND_IN_SET(rat.parent_id,ru.article_id))
-        left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
-        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1
-        <if test="keyWord != null and keyWord != ''">
-            and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%')
-        </if>
-        group by ru.id) t where FIND_IN_SET(${articleId},t.article_id) and FIND_IN_SET(${buildId},t.build_id)
-        order by t.rdr_count
-    </select>
-
-    <!--获取协作下拉人员信息-->
-    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="collaboratorUserMap">
-        <result property="id" column="id"/>
-        <result property="name" column="user_name"/>
-    </resultMap>
-    <select id="queryCollaboratorUser" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="collaboratorUserMap">
-        select ru.id,ru.user_name from repair_user ru
-        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>

+ 0 - 13
target/classes/mapper/repair/RepairWorkTypeMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.RepairWorkTypeMapper">
-    <!-- 可根据自己的需求,是否要使用 -->
-    <resultMap type="com.repair.model.vo.RepairWorkTypeVo" id="repairWorkTypeMap">
-        <result property="id" column="id"/>
-        <result property="name" column="name"/>
-    </resultMap>
-
-    <select id="queryWorkTypeList" resultType="com.repair.model.vo.RepairWorkTypeVo" resultMap="repairWorkTypeMap">
-       select id,name from repair_work_type where deleted = 0
-    </select>
-</mapper>

+ 0 - 5
target/classes/mapper/repair/WxAccessTokenMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.repair.mapper.WxAccessTokenMapper">
-
-</mapper>

+ 0 - 3
target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=repair_system
-groupId=com.repair
-version=0.0.1-SNAPSHOT

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

@@ -1,323 +0,0 @@
-com\repair\AutoCode.class
-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
-com\repair\services\RepairCollaborateRecordService.class
-com\repair\model\vo\MasterHomepageVo.class
-com\repair\api\LoginControllerAPI.class
-com\repair\mapper\RepairTrackRecordMapper.class
-com\repair\model\enumModel\ePayPageStatu.class
-com\repair\api\RepairTransferRecordControllerAPI.class
-com\repair\mapper\RepairEvaluateMapper.class
-com\repair\model\vo\MaintenanceTechnicianVo.class
-com\repair\MybatisPlusApplication.class
-com\repair\model\pojo\RepairCollaborateRecord.class
-com\repair\services\impl\RepairEvaluateServiceImpl.class
-com\repair\services\RepairConsumeService.class
-com\repair\model\pojo\RepairClassesSettings.class
-com\repair\model\pojo\RepairConsume.class
-com\repair\api\RepairArticleTypeControllerAPI.class
-com\repair\model\vo\ConsumableExcelVo.class
-com\repair\model\vo\ReportExportVo.class
-com\repair\model\pojo\RepairConsumables.class
-com\repair\model\vo\shiftSettingVo.class
-com\repair\mapper\RepairAdminMapper.class
-com\repair\mapper\RepairReceivingMapper.class
-com\repair\services\RepairRefundRecordService.class
-com\repair\model\enumModel\eDispatchType.class
-com\repair\model\request\insertRepairClassesRequest.class
-com\repair\common\utils\WeiXiaoUtil.class
-com\repair\model\vo\RepairCardNumberVo.class
-com\repair\model\pojo\RepairPayRecord.class
-com\repair\handler\MyMetaObjectHandler.class
-com\repair\model\enumModel\eIsSuccess.class
-com\repair\model\vo\SystemMenuTreeVo.class
-com\repair\controller\RepairSchoolController.class
-com\repair\services\RepairCloseService.class
-com\repair\api\RepairWorkTypeControllerAPI.class
-com\repair\handle\NonStaticResourceHttpRequestHandler.class
-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
-com\repair\api\RepairReceivingControllerAPI.class
-com\repair\core\CORSConfiguration.class
-com\repair\services\impl\RepairClassesSettingsServiceImpl.class
-com\repair\services\impl\RepairCollaborateRecordServiceImpl.class
-com\repair\controller\RepairClassesSettingsController.class
-com\repair\common\utils\DateUtils.class
-com\repair\controller\RepairArticleTypeController.class
-com\repair\services\impl\WxAccessTokenServiceImpl.class
-com\repair\api\RepairPayRecordControllerAPI.class
-com\repair\model\result\BaseResult.class
-com\repair\model\request\repairRecordRequest.class
-com\repair\services\impl\RepairSystemMessagesServiceImpl.class
-com\repair\model\vo\ProsperityRepairPayRecordsVo.class
-com\repair\model\result\PageUtils.class
-com\repair\services\impl\RepairNoticeSettingServiceImpl.class
-com\repair\controller\WxAccessTokenController.class
-com\repair\model\vo\pendingOrderVo.class
-com\repair\model\pojo\UnitTimeHelpModel.class
-com\repair\services\impl\RepairDispatchRecordServiceImpl.class
-com\repair\common\utils\WxUtil$1.class
-com\repair\common\utils\UUIDUtils.class
-com\repair\mapper\RepairSchoolMapper.class
-com\repair\model\vo\routeDataVo.class
-com\repair\model\enumModel\eStatu.class
-com\repair\services\RepairWorkTypeService.class
-com\repair\mapper\RepairConsumablesMapper.class
-com\repair\model\enumModel\eIsTop.class
-com\repair\model\enumModel\eUserZZ.class
-com\repair\services\impl\RepairWorkTypeServiceImpl.class
-com\repair\api\RepairClassesSettingsControllerAPI.class
-com\repair\model\vo\RepairClassesVo.class
-com\repair\model\pojo\RepairArea.class
-com\repair\model\vo\NoticePageVo.class
-com\repair\services\impl\RepairReceivingServiceImpl.class
-com\repair\model\request\insertRepairUserRequest.class
-com\repair\model\vo\RepairSchoolVo.class
-com\repair\model\vo\RepairConsumeVo.class
-com\repair\model\result\CommonResult.class
-com\repair\common\exception\EmsException.class
-com\repair\model\request\cooperationOrdersRequest.class
-com\repair\controller\RepairReceivingController.class
-com\repair\controller\RepairEvaluateController.class
-com\repair\services\impl\RepairConsumeServiceImpl.class
-com\repair\model\vo\ClassesSettingVo.class
-com\repair\controller\RepairRefundRecordController.class
-com\repair\model\request\insertRepairAssociationRequest.class
-com\repair\model\vo\RepairRecordPageVo.class
-com\repair\model\request\timeVo.class
-com\repair\controller\RepairConsumablesController.class
-com\repair\services\WxAccessTokenService.class
-com\repair\api\RepairShiftSettingsControllerAPI.class
-com\repair\model\pojo\RepairTransferRecord.class
-com\repair\common\utils\MyX509TrustManager.class
-com\repair\common\utils\ValidateCode.class
-com\repair\model\vo\TransferDetailVo.class
-com\repair\services\RepairDispatchRecordService.class
-com\repair\api\RepairNoticeSettingControllerAPI.class
-com\repair\controller\RepairDispatchRecordController.class
-com\repair\services\RepairClassesSettingsService.class
-com\repair\model\enumModel\eDispatchResult.class
-com\repair\model\pojo\RepairEvaluate.class
-com\repair\services\RepairTrackRecordService.class
-com\repair\model\enumModel\eRecordStatu.class
-com\repair\model\vo\RepairLogisticsVo.class
-com\repair\mapper\RepairDispatchRecordMapper.class
-com\repair\model\pojo\RepairRecord.class
-com\repair\api\RepairSchoolControllerAPI.class
-com\repair\model\pojo\RepairArticleType.class
-com\repair\api\RepairCloseControllerAPI.class
-com\repair\model\pojo\RepairClose.class
-com\repair\common\utils\WeiXiaoUtil$1.class
-com\repair\model\vo\RepairArticleTreeVo.class
-com\repair\common\utils\SeqUtils.class
-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
-com\repair\services\RepairPayRecordService.class
-com\repair\common\utils\HttpsClient.class
-com\repair\model\vo\RepairArticleTreeVo$RepairArticleTreeVoBuilder.class
-com\repair\model\vo\RepairWorkTypeVo.class
-com\repair\common\utils\ExcelUtils.class
-com\repair\common\utils\StrUtils.class
-com\repair\services\impl\RepairCloseServiceImpl.class
-com\repair\model\vo\LoginVo.class
-com\repair\model\request\RefundableAmountRequest.class
-com\repair\services\impl\RepairSystemSettingServiceImpl.class
-com\repair\common\result\Code.class
-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
-com\repair\controller\RepairAreaController.class
-com\repair\model\vo\RepairTechnicianVo.class
-com\repair\services\impl\RepairArticleTypeServiceImpl.class
-com\repair\model\enumModel\eApprovalStatu.class
-com\repair\api\RepairConsumeControllerAPI.class
-com\repair\controller\RepairCloseController.class
-com\repair\model\pojo\RepairSchool.class
-com\repair\common\exception\MyCustomException.class
-com\repair\controller\RepairSystemSettingController.class
-com\repair\model\vo\RepairAreaTreeVo.class
-com\repair\controller\LoginController$1.class
-com\repair\controller\RepairAdminController.class
-com\repair\core\SwaggerConfiguration.class
-com\repair\model\request\transferApplyRequest.class
-com\repair\services\RepairLeaveMessageService.class
-com\repair\mapper\RepairSystemSettingMapper.class
-com\repair\model\vo\NoticeVo.class
-com\repair\model\request\loginRequest.class
-com\repair\model\vo\UploadFileVo.class
-com\repair\api\RepairSystemSettingControllerAPI.class
-com\repair\mapper\RepairUserMapper.class
-com\repair\model\pojo\WxAccessToken.class
-com\repair\model\request\updateRepairAreaRequest.class
-com\repair\annotation\PassToken.class
-com\repair\config\MySecurity.class
-com\repair\model\vo\CollaborateDetailVo.class
-com\repair\model\enumModel\eUserStatu.class
-com\repair\api\RepairSystemMessagesControllerAPI.class
-com\repair\model\vo\RepairManageCountVo.class
-com\repair\common\utils\SendSms.class
-com\repair\controller\RepairWorkTypeController.class
-META-INF\spring-configuration-metadata.json
-com\repair\core\CORSConfiguration$1.class
-com\repair\model\pojo\RepairDispatchRecord.class
-com\repair\model\vo\ChangePriceConsumeVo.class
-com\repair\mapper\RepairShiftSettingsMapper.class
-com\repair\model\vo\wxLoginVo.class
-com\repair\controller\RepairPayRecordController.class
-com\repair\api\RepairDispatchRecordControllerAPI.class
-com\repair\mapper\RepairRecordMapper.class
-com\repair\model\request\updateRepairArticleTypeRequest.class
-com\repair\services\impl\RepairSchoolServiceImpl.class
-com\repair\model\request\queryAccountPageRequest.class
-com\repair\common\utils\paramUtils.class
-com\repair\services\impl\RepairRefundRecordServiceImpl.class
-com\repair\services\impl\RepairLeaveMessageServiceImpl.class
-com\repair\services\RepairReceivingService.class
-com\repair\api\RepairRecordControllerAPI.class
-com\repair\model\vo\EvaluateVo.class
-com\repair\mapper\RepairClassesSettingsMapper.class
-com\repair\model\request\insertConsumablesRequest.class
-com\repair\model\vo\ConsumablePageVo.class
-com\repair\common\utils\TimeExchange$1.class
-com\repair\model\request\updateRepairAdminRequest.class
-com\repair\model\request\repairPayRequest.class
-com\repair\model\request\updateUserDataRequest.class
-com\repair\model\vo\TeamWorkCountVo.class
-com\repair\controller\RepairCollaborateRecordController.class
-com\repair\controller\RepairLeaveMessageController.class
-com\repair\services\impl\RepairConsumablesServiceImpl.class
-com\repair\model\pojo\RepairWorkType.class
-com\repair\common\utils\CommonUtil.class
-com\repair\model\request\transferRequest.class
-com\repair\common\utils\DelayedUtils$2.class
-com\repair\api\RepairRefundRecordControllerAPI.class
-com\repair\aop\LoginCheckAspect.class
-com\repair\model\pojo\RepairTrackRecord.class
-com\repair\common\utils\EncryptionUtil.class
-com\repair\controller\LoginController.class
-com\repair\model\pojo\RepairUser.class
-com\repair\common\utils\MimeTypeUtils.class
-com\repair\model\vo\ChangeConsumesVo.class
-com\repair\model\vo\CollaborateDataVo.class
-com\repair\mapper\RepairArticleTypeMapper.class
-com\repair\services\impl\RepairRecordServiceImpl.class
-com\repair\model\pojo\RepairLeaveMessage.class
-com\repair\model\vo\RepairArticleTypeTreeVo.class
-com\repair\model\vo\CollaboratorVo.class
-com\repair\model\pojo\RepairSystemMessages.class
-com\repair\common\utils\DelayedUtils$1.class
-com\repair\mapper\RepairSystemMessagesMapper.class
-com\repair\model\vo\RepairArticleTypeTreeVo$RepairArticleTypeTreeVoBuilder.class
-com\repair\controller\RepairTrackRecordController.class
-com\repair\model\vo\RepairArticleChildVo.class
-com\repair\services\RepairSystemMessagesService.class
-com\repair\api\RepairConsumablesControllerAPI.class
-com\repair\mapper\RepairCloseMapper.class
-com\repair\model\vo\AutoDispatchUserVo.class
-com\repair\model\vo\RepairArticleConsumeVo.class
-com\repair\config\WxOpenidConfig.class
-com\repair\common\utils\TimeExchange.class
-com\repair\controller\RepairTransferRecordController.class
-com\repair\model\vo\DetailsVo.class
-com\repair\model\enumModel\eTechnicianStatu.class
-com\repair\services\RepairArticleTypeService.class
-com\repair\model\enumModel\eIsSuper.class
-com\repair\api\RepairAreaControllerAPI.class
-com\repair\model\request\updateRepairClassesRequest.class
-com\repair\common\utils\JWTUtil.class
-com\repair\services\RepairUserService.class
-com\repair\model\request\transferOrderRequest.class
-com\repair\model\pojo\RepairRefundRecord.class
-com\repair\model\vo\SystemMenuTreeVo$SystemMenuTreeVoBuilder.class
-com\repair\controller\RepairNoticeSettingController.class
-com\repair\controller\RepairSystemMessagesController.class
-com\repair\model\enumModel\eWeekStatu.class
-com\repair\services\impl\RepairTransferRecordServiceImpl.class
-com\repair\services\RepairSystemSettingService.class
-com\repair\model\pojo\RepairSystemSetting.class
-com\repair\mapper\WxAccessTokenMapper.class
-com\repair\model\vo\ClassSettingDateVo.class
-com\repair\model\vo\ClassesSettingPageDataVo.class
-com\repair\api\RepairLeaveMessageControllerAPI.class
-com\repair\api\RepairUserControllerAPI.class
-com\repair\config\MyBatisPlusConfig.class
-com\repair\mapper\RepairWorkTypeMapper.class
-com\repair\model\request\repairLeaveMessageRequest.class
-com\repair\services\impl\RepairAreaServiceImpl.class
-com\repair\services\impl\RepairPayRecordServiceImpl.class
-com\repair\model\request\updateRepairShiftRequest.class
-com\repair\model\vo\UserDataVo.class
-com\repair\services\RepairEvaluateService.class
-com\repair\controller\MaintenanceConsumeablesRequest.class
-com\repair\model\request\AlterPriceRequest.class
-com\repair\model\pojo\RepairShiftSettings.class
-com\repair\model\vo\RepairRecordCountVo.class
-com\repair\services\RepairTransferRecordService.class
-com\repair\common\utils\WxConstants.class
-com\repair\model\request\DelayedRequest.class
-com\repair\model\request\freezeRepairAdminRequest.class
-com\repair\model\request\updateAddressBookRequest.class
-com\repair\core\JwtlnterceptorConfig.class
-com\repair\services\impl\RepairAdminServiceImpl.class
-com\repair\model\vo\RepairUserVo.class
-com\repair\model\vo\SystemMenuVo.class
-com\repair\mapper\RepairTransferRecordMapper.class
-com\repair\common\utils\smsUtil.class
-com\repair\annotation\UserLoginCheck.class
-com\repair\common\utils\DelayedUtils.class
-com\repair\controller\RepairUserController.class
-com\repair\model\request\updateRepairConsumeRequest.class
-com\repair\controller\RepairShiftSettingsController.class
-com\repair\api\RepairTrackRecordControllerAPI.class
-com\repair\common\utils\SHA1.class
-com\repair\api\RepairAdminControllerAPI.class
-com\repair\services\RepairAdminService.class
-com\repair\model\vo\MyRepairRecordVo.class
-com\repair\services\RepairSchoolService.class
-com\repair\annotation\ControllerIsShow.class
-com\repair\common\utils\RSAUtils.class
-com\repair\model\vo\SystemMenuVo$SystemMenuVoBuilder.class
-com\repair\common\exception\EmsExceptionHandler.class
-com\repair\services\RepairAreaService.class
-com\repair\model\vo\RepairAreaTreeVo$RepairAreaTreeVoBuilder.class
-com\repair\model\request\RevertRequest.class
-com\repair\model\request\finishOrderRequest.class
-com\repair\services\impl\RepairUserServiceImpl.class
-com\repair\common\result\ResponseStatusEnum.class
-com\repair\services\impl\RepairTrackRecordServiceImpl.class
-com\repair\mapper\RepairCollaborateRecordMapper.class
-com\repair\model\request\ReceiveSendOrdersRequest.class
-com\repair\model\pojo\RepairAdmin.class
-com\repair\mapper\RepairRefundRecordMapper.class
-com\repair\model\request\insertRepairShiftSettingRequest.class
-com\repair\services\RepairConsumablesService.class
-com\repair\model\request\changePasswordRequest.class
-com\repair\model\enumModel\eSchool.class
-com\repair\model\vo\CollaborateRecordVo.class
-com\repair\model\pojo\RepairReceiving.class
-com\repair\model\result\Wx_user.class

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

@@ -1,309 +0,0 @@
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairEvaluateController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eFileType.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairPayRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairCollaborateRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairWorkTypeMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairWorkType.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ChangePriceConsumeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairRefundRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eSchool.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WxConstants.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairArea.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\aop\LoginCheckAspect.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\CollaborateDataVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairSystemSetting.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\WxAccessTokenController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SendSms.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairReceivingController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\PageUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ChangeConsumesVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairTrackRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairCollaborateRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairNoticeSettingController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eRecordStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MyRepairRecordVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairSystemMessagesControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairArticleTypeMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\MybatisPlusApplication.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\WxOpenidConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairConsumablesControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\smsUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\CommonUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairConsumeRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairDispatchRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\changePasswordRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\CollaborateRecordVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairConsumeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairWorkTypeServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairNoticeSettingControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairConsumeControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SHA1.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairWorkTypeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\ePayPageStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairAreaService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairArticleTypeRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairEvaluateServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSystemMessagesMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairTrackRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassSettingDateVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairCardNumberVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\UnitTimeHelpModel.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\PassToken.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\JWTUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\AesUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairDispatchRecordControllerAPI.java
-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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertConsumablesRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\transferRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\WxAccessTokenServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairNoticeSettingService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\SmsConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eIsSuccess.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleConsumeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairLogisticsVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairUserController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WeiXiaoUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\TransferDetailVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSystemSettingService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairPayRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairLeaveMessage.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\result\Code.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\shiftSettingVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\ControllerIsShow.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairLeaveMessageController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eUserStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\wxLoginVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSystemSettingServiceImpl.java
-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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\pendingOrderVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingPageVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumablePageVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\DelayedRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairConsumablesController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\result\ResponseStatusEnum.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MaintenanceTechnicianVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairRefundRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\repairLeaveMessageRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairReceivingMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairSystemSettingControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairArticleType.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairConsumablesService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\MimeTypeUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eTechnicianStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairReceiving.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairAreaControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\ReceiveSendOrdersRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\SystemMenuVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\WxAccessTokenService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairSchoolControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSchoolController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\AddressBookListVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairAdminService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairPayRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairClassesSettingsService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairUser.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\EncryptionUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\transferApplyRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairShiftSettingsControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairCollaborateRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairArticleTypeServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairArticleTypeService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ReportExportVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairShiftSettingRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairTransferRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairShiftSettings.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateAddressBookRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairConsumables.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\StrUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairDispatchRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairSystemMessages.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairRefundRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSchoolMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairWorkTypeControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\LoginController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairNoticeSettingMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairEvaluateControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairConsumeMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairClassesSettingsMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eApprovalStatu.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairEvaluateMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\repairRecordRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairTrackRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairReceivingControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\WxUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairConsumeServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\MasterHomepageVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairTransferRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairRefundRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairAreaTreeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\UploadFileVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\WxAccessToken.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\AutoDispatchUserVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSystemMessagesService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\SystemMenuTreeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSystemMessagesServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eDispatchResult.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eIsSuper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairUserRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairRefundRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairClassesRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairClassesSettings.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairNoticeSettingServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\UUIDUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\CommonResult.java
-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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ExcelUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\timeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairConsumablesServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairAdminRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\LoginControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairConsume.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairUserVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ExcelExportUtil.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\repairPayRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\DateUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairCollaborateRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\cooperationOrdersRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\collaborateApplyRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairDispatchRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairCloseMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\routeDataVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\MySecurity.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairShiftSettingsMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairNoticeSetting.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairAdminController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairAreaServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairSchoolVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\SeqUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\paramUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\HttpsClient.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleChildVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ProsperityRepairPayRecordsVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\annotation\UserLoginCheck.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\CollaboratorVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\ValidateCode.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\handle\NonStaticResourceHttpRequestHandler.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairClassesVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\MyX509TrustManager.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairDispatchRecordServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairReceivingService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairTrackRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\AutoCode.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairSchoolService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\CORSConfiguration.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairCloseControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\transferOrderRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairSchoolServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairArticleTypeControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairClose.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\insertRepairAssociationRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\EmsException.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairCollaborateRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairTrackRecordControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairEvaluate.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairShiftSettingsService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\AlterPriceRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairConsumeController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ClassesSettingPageDataVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairAreaController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairAdmin.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\RSAUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\MyCustomException.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairUserMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairUserServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\LoginVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairTechnicianVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairArticleTypeController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\JwtlnterceptorConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\TimeExchange.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairUserService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\exception\EmsExceptionHandler.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\SwaggerConfiguration.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\ConsumableExcelVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairClassesSettingsController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\finishOrderRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eIsTop.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairAdminMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\loginRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\result\Wx_user.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairReceivingServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\handler\MyMetaObjectHandler.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\TeamWorkCountVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\common\utils\DelayedUtils.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eUserZZ.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairAreaMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairEvaluateService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\MyBatisPlusConfig.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\enumModel\eDispatchType.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairClassesSettingsControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairLeaveMessageMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairShiftRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSystemMessagesController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairTransferRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairTransferRecordController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordCountVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairLeaveMessageControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairWorkTypeService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\RefundableAmountRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateRepairAreaRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairRecordPageVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairClassesSettingsServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairCloseController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairTransferRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairShiftSettingsController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairCloseServiceImpl.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\CollaborateDetailVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairPayRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\pojo\RepairRecord.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateUserDataRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairSystemSettingMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairSystemSettingController.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\impl\RepairLeaveMessageServiceImpl.java
-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
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleTypeTreeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairCollaborateRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\WxAccessTokenMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\api\RepairAdminControllerAPI.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\queryAccountPageRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairPayRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairPayRecordMapper.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\vo\RepairArticleTreeVo.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairCloseService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\core\JwtAuthenticationInterceptor.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\services\RepairTransferRecordService.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\MobileRevertRequest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\freezeRepairAdminRequest.java

+ 0 - 2
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1,2 +0,0 @@
-com\repair\MybatisPlusApplicationTests.class
-com\repair\WrapperTest.class

+ 0 - 2
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1,2 +0,0 @@
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\test\java\com\repair\WrapperTest.java
-D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\test\java\com\repair\MybatisPlusApplicationTests.java

BIN
target/repair_system-0.0.1-SNAPSHOT.jar.original