报修详情

.idea/encodings.xml

@@ -2,15 +2,6 @@
 <project version="4">
   <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/HttpsClient.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/MyX509TrustManager.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/SHA1.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/TimeExchange.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WxConstants.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WxUtil.java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/WxPayRequest.java" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/Wx_user.java" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

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

@@ -1,6 +1,5 @@
 package com.repair.api;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.repair.model.pojo.RepairAdmin;
 import com.repair.model.request.changePasswordRequest;
 import com.repair.model.request.loginRequest;

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

@@ -2,12 +2,10 @@ package com.repair.api;
 
 import com.repair.model.pojo.RepairAdmin;
 import com.repair.model.request.freezeRepairAdminRequest;
-import com.repair.model.request.queryAccountPageRequest;
 import com.repair.model.request.updateRepairAdminRequest;
 import com.repair.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

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

@@ -6,7 +6,6 @@ import com.repair.model.request.updateRepairConsumeRequest;
 import com.repair.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

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

@@ -9,7 +9,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 
 @RequestMapping("/api/repairEvaluate")
 @Api(tags = {"RepairEvaluateController"}, value = "评价")

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

@@ -12,8 +12,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Date;
 
 
 @RequestMapping("/api/repairRecord")
@@ -27,7 +25,7 @@ public interface RepairRecordControllerAPI {
 
     @PostMapping(value = "/returnPay")
     @ApiOperation(value = "微信支付回调", notes = "微信支付回调", httpMethod = "POST")
-    void returnPay(HttpServletRequest request, HttpServletResponse response) throws IOException;
+    void returnPay(HttpServletRequest request, HttpServletResponse response) throws Exception;
 
     @PostMapping(value = "/insertRepairRecord")
     @ApiOperation(value = "提交报修订单", notes = "提交报修订单", httpMethod = "POST")
@@ -135,7 +133,7 @@ public interface RepairRecordControllerAPI {
 
     @PostMapping(value = "/transfer")
     @ApiOperation(value = "转单审核", notes = "转单审核", httpMethod = "POST")
-    CommonResult transfer(@RequestBody transferRequest transferRequest,@RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
+    CommonResult transfer(@RequestBody transferRequest transferRequest, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
 
     @GetMapping(value = "/cooperationDetail")
     @ApiOperation(value = "获取协作审核数据", notes = "获取协作审核数据", httpMethod = "GET")
@@ -175,7 +173,7 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/reportExport")
     @ApiOperation(value = "报表导出", notes = "报表导出", httpMethod = "GET")
-    void reportExport(HttpServletResponse response,String keyWord, String startTime, String endTime, Integer schoolId, @RequestParam Integer state, @RequestHeader("user_head") String userhead) throws Exception;
+    void reportExport(HttpServletResponse response, String keyWord, String startTime, String endTime, Integer schoolId, @RequestParam Integer state, @RequestHeader("user_head") String userhead) throws Exception;
 
     @GetMapping(value = "/queryMasterHomeCount")
     @ApiOperation(value = "维修师傅首页头部数量", notes = "维修师傅首页头部数量", httpMethod = "GET")
@@ -191,27 +189,27 @@ public interface RepairRecordControllerAPI {
 
     @GetMapping(value = "/repairArea")
     @ApiOperation(value = "报修区域统计", notes = "报修区域统计", httpMethod = "GET")
-    CommonResult repairArea(@RequestParam int state,@RequestParam int currentPage, @RequestParam int pageCount) throws Exception;
+    CommonResult repairArea(@RequestParam int state, @RequestParam int currentPage, @RequestParam int pageCount) throws Exception;
 
     @GetMapping(value = "/repairAreaExport")
     @ApiOperation(value = "报修区域统计导出", notes = "报修区域统计导出", httpMethod = "GET")
-    void repairAreaExport(HttpServletResponse response,@RequestParam int state) throws Exception;
+    void repairAreaExport(HttpServletResponse response, @RequestParam int state) throws Exception;
 
     @GetMapping(value = "/maintenanceGoods")
     @ApiOperation(value = "维修物品统计", notes = "维修物品统计", httpMethod = "GET")
-    CommonResult maintenanceGoods(@RequestParam int state,@RequestParam int currentPage, @RequestParam int pageCount) throws Exception;
+    CommonResult maintenanceGoods(@RequestParam int state, @RequestParam int currentPage, @RequestParam int pageCount) throws Exception;
 
     @GetMapping(value = "/maintenanceGoodsExport")
     @ApiOperation(value = "维修物品统计导出", notes = "维修物品统计导出", httpMethod = "GET")
-    void maintenanceGoodsExport(HttpServletResponse response,@RequestParam int state) throws Exception;
+    void maintenanceGoodsExport(HttpServletResponse response, @RequestParam int state) throws Exception;
 
     @GetMapping(value = "/maintenanceWorker")
     @ApiOperation(value = "维修师傅效率统计", notes = "维修师傅效率统计", httpMethod = "GET")
-    CommonResult maintenanceWorker(@RequestParam int state,@RequestParam int currentPage, @RequestParam int pageCount) throws Exception;
+    CommonResult maintenanceWorker(@RequestParam int state, @RequestParam int currentPage, @RequestParam int pageCount) throws Exception;
 
     @GetMapping(value = "/maintenanceWorkerExport")
     @ApiOperation(value = "维修师傅效率统计导出", notes = "维修师傅效率统计导出", httpMethod = "GET")
-    void maintenanceWorkerExport(HttpServletResponse response,@RequestParam int state) throws Exception;
+    void maintenanceWorkerExport(HttpServletResponse response, @RequestParam int state) throws Exception;
 
     @GetMapping(value = "/repairAnalysis")
     @ApiOperation(value = "报修分析统计", notes = "报修分析统计", httpMethod = "GET")
@@ -221,4 +219,9 @@ public interface RepairRecordControllerAPI {
     @ApiOperation(value = "报修趋势统计", notes = "报修趋势统计", httpMethod = "GET")
     CommonResult repairTrend(@RequestParam int state) throws Exception;
 
+    @GetMapping(value = "/repairSummarizing")
+    @ApiOperation(value = "总数据汇总统计", notes = "总数据汇总统计", httpMethod = "GET")
+    CommonResult repairSummarizing() throws Exception;
+
+
 }

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

@@ -1,6 +1,5 @@
 package com.repair.api;
 
-import com.repair.model.pojo.RepairShiftSettings;
 import com.repair.model.request.insertRepairShiftSettingRequest;
 import com.repair.model.request.updateRepairShiftRequest;
 import com.repair.model.result.CommonResult;

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

@@ -6,7 +6,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 @RequestMapping("/api/repairSystemSetting")
 @Api(tags = {"RepairSystemSettingController"}, value = "系统设置")

src/main/java/com/repair/common/exception/EmsExceptionHandler.java

@@ -1,6 +1,7 @@
 package com.repair.common.exception;
 
 import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import com.repair.common.result.ResponseStatusEnum;
 import com.repair.model.result.CommonResult;
 import org.mybatis.spring.MyBatisSystemException;
@@ -17,13 +18,13 @@ import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/repair/common/utils/DateUtils.java

@@ -58,14 +58,102 @@ public class DateUtils {
 
         return null;
     }
+
+
+
     public static String endTime(){
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return LocalDateTime.now().format(dateTimeFormatter);
     }
+
+    public static String trendStartTime(Integer state){
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime now = LocalDateTime.now();
+        now=now.withHour(0).withMinute(0).withSecond(0);
+        switch (state) {
+//           本年
+            case 1:
+                LocalDateTime localDateTime = now.withDayOfYear(1);
+                return localDateTime.format(dateTimeFormatter);
+//           本月
+            case 2:
+                LocalDateTime localDateTime1 = now.withDayOfMonth(1);
+                return localDateTime1.format(dateTimeFormatter);
+
+//            本周
+            case 3:
+                int value = now.getDayOfWeek().getValue();
+                LocalDateTime localDateTime2 = now.minusDays(value-1);
+                return localDateTime2.format(dateTimeFormatter);
+
+//            今天
+            case 4: ;
+                return now.format(dateTimeFormatter);
+        }
+
+        return null;
+    }
+
+    /**
+     *
+     * @param state
+     * @return
+     */
+    public static String trendComparisonStartTime(Integer state) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime now = LocalDateTime.now();
+        now=now.withHour(0).withMinute(0).withSecond(0);
+
+        switch (state) {
+//           去年
+            case 1:
+                LocalDateTime localDateTime = now.minusYears(1).withDayOfYear(1);
+                return localDateTime.format(dateTimeFormatter);
+//           上月
+            case 2:
+                LocalDateTime localDateTime1 = now.minusMonths(1).withDayOfMonth(1);
+
+                return localDateTime1.format(dateTimeFormatter);
+
+//            上周
+            case 3:
+                int value = now.getDayOfWeek().getValue();
+                LocalDateTime localDateTime2 = now.minusWeeks(1).minusDays(value-1);
+                return localDateTime2.format(dateTimeFormatter);
+
+//            昨天
+            case 4:
+                LocalDateTime localDateTime3 = now.minusDays(1);
+                return localDateTime3.format(dateTimeFormatter);
+        }
+
+        return null;
+    }
+
+    public static String weekName(int weekState){
+        switch (weekState) {
+            case 1:
+                return "星期一";
+            case 2:
+                return "星期二";
+            case 3:
+                return "星期三";
+            case 4:
+                return "星期四";
+            case 5:
+                return "星期五";
+            case 6:
+                return "星期六";
+            case 7:
+                return "星期日";
+        }
+        return null;
+    }
+
     public static void main(String[] args) {
-        String s = startTime(4);
+        String s = trendStartTime(4);
         System.out.println("s = " + s);
-        String s1 = endTime();
+        String s1 = trendComparisonStartTime(4);
         System.out.println("s1 = " + s1);
     }
 }

src/main/java/com/repair/common/utils/ExcelExportUtil.java

@@ -2,8 +2,10 @@ package com.repair.common.utils;
 
 import org.apache.poi.hpsf.Decimal;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/java/com/repair/common/utils/ExcelUtils.java

@@ -1,6 +1,5 @@
 package com.repair.common.utils;
 
-import com.repair.model.result.CommonResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.boot.system.ApplicationHome;

src/main/java/com/repair/common/utils/HttpUtils.java

@@ -1,6 +1,7 @@
 package com.repair.common.utils;
 
 import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -12,7 +13,6 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
-import org.apache.http.NameValuePair;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/repair/common/utils/SendSms.java

@@ -1,22 +1,20 @@
 package com.repair.common.utils;
 
+import com.repair.config.SmsConfig;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
-
-//导入可选配置类
 import com.tencentcloudapi.common.profile.ClientProfile;
 import com.tencentcloudapi.common.profile.HttpProfile;
-
-// 导入对应SMS模块的client
 import com.tencentcloudapi.sms.v20210111.SmsClient;
-
-// 导入要请求接口对应的request response类
 import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
 import com.tencentcloudapi.sms.v20210111.models.SendStatus;
-import com.repair.config.SmsConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 
+//导入可选配置类
+// 导入对应SMS模块的client
+// 导入要请求接口对应的request response类
+
 /**
  * Tencent Cloud Sms Sendsms
  */

src/main/java/com/repair/common/utils/SeqUtils.java

@@ -1,7 +1,6 @@
 package com.repair.common.utils;
 
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
 

src/main/java/com/repair/common/utils/StrUtils.java

@@ -1,8 +1,10 @@
 package com.repair.common.utils;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * @Author: binguo

src/main/java/com/repair/common/utils/TimeExchange.java

@@ -2,8 +2,6 @@ package com.repair.common.utils;
 
 import com.repair.model.enumModel.eWeekStatu;
 import com.repair.model.pojo.UnitTimeHelpModel;
-import com.repair.model.request.insertConsumablesRequest;
-import com.repair.model.vo.ChangeConsumesVo;
 import com.repair.model.vo.ClassSettingDateVo;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;

src/main/java/com/repair/common/utils/WeiXiaoUtil.java

@@ -9,12 +9,13 @@ import com.repair.services.WxAccessTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: binguo

src/main/java/com/repair/common/utils/WxUtil.java

@@ -8,7 +8,6 @@ import org.w3c.dom.NodeList;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import java.util.Map.Entry;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -21,6 +20,7 @@ import java.io.*;
 import java.security.MessageDigest;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * 微信公众号接口工具类

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

@@ -1,15 +1,14 @@
 package com.repair.controller;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.repair.annotation.PassToken;
 import com.repair.api.LoginControllerAPI;
+import com.repair.common.utils.AesUtils;
 import com.repair.common.utils.HttpsClient;
+import com.repair.common.utils.JWTUtil;
+import com.repair.common.utils.paramUtils;
 import com.repair.config.WxOpenidConfig;
 import com.repair.model.enumModel.eSchool;
 import com.repair.model.enumModel.eStatu;
@@ -22,20 +21,12 @@ import com.repair.model.result.CommonResult;
 import com.repair.model.result.Wx_user;
 import com.repair.model.vo.*;
 import com.repair.services.RepairAdminService;
-import com.repair.common.utils.AesUtils;
-import com.repair.common.utils.paramUtils;
-import com.repair.common.utils.JWTUtil;
 import com.repair.services.RepairUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -43,7 +34,6 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.URL;
 import java.net.URLConnection;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

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

@@ -10,14 +10,12 @@ import com.repair.model.request.freezeRepairAdminRequest;
 import com.repair.model.request.updateRepairAdminRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
-import com.repair.model.vo.ConsumableExcelVo;
 import com.repair.services.RepairAdminService;
 import com.repair.services.RepairUserService;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
-
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -3,20 +3,19 @@ package com.repair.controller;
 
 import com.repair.api.RepairArticleTypeControllerAPI;
 import com.repair.common.utils.paramUtils;
-import com.repair.model.pojo.RepairArea;
 import com.repair.model.pojo.RepairArticleType;
 import com.repair.model.request.updateRepairArticleTypeRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
-import com.repair.model.vo.*;
+import com.repair.model.vo.RepairArticleChildVo;
+import com.repair.model.vo.RepairArticleConsumeVo;
 import com.repair.model.vo.RepairArticleTypeTreeVo;
-import com.repair.services.RepairAreaService;
+import com.repair.model.vo.RepairWorkTypeVo;
 import com.repair.services.RepairArticleTypeService;
 import com.repair.services.RepairConsumeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;

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

@@ -1,6 +1,5 @@
 package com.repair.controller;
 
-import com.repair.annotation.PassToken;
 import com.repair.api.RepairClassesSettingsControllerAPI;
 import com.repair.common.utils.ExcelExportUtil;
 import com.repair.common.utils.ExcelUtils;
@@ -28,9 +27,7 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
-
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 

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

@@ -2,7 +2,6 @@ package com.repair.controller;
 
 
 import com.repair.api.RepairCloseControllerAPI;
-
 import com.repair.common.utils.paramUtils;
 import com.repair.model.pojo.RepairClose;
 import com.repair.model.result.CommonResult;

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

@@ -4,15 +4,11 @@ package com.repair.controller;
 import com.repair.api.RepairCollaborateRecordControllerAPI;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.pojo.RepairCollaborateRecord;
-import com.repair.model.pojo.RepairCollaborateRecord;
-import com.repair.model.pojo.RepairCollaborateRecord;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.services.RepairCollaborateRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

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

@@ -10,6 +10,7 @@ import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.RepairConsumables;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.pojo.RepairSystemMessages;
+import com.repair.model.pojo.RepairTrackRecord;
 import com.repair.model.request.insertConsumablesRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
@@ -20,17 +21,16 @@ import com.repair.model.vo.ConsumablePageVo;
 import com.repair.services.RepairConsumablesService;
 import com.repair.services.RepairRecordService;
 import com.repair.services.RepairSystemMessagesService;
+import com.repair.services.RepairTrackRecordService;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -49,10 +49,12 @@ import java.util.stream.Collectors;
 public class RepairConsumablesController implements RepairConsumablesControllerAPI {
 
     @Autowired
-    private RepairConsumablesService repairConsumablesService;
-    @Autowired
     private RepairRecordService repairRecordService;
     @Autowired
+    private RepairTrackRecordService repairTrackRecordService;
+    @Autowired
+    private RepairConsumablesService repairConsumablesService;
+    @Autowired
     private RepairSystemMessagesService repairSystemMessagesService;
 
     @Override
@@ -217,10 +219,21 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             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("报修单提交失败！");
+            rsm.setIsRead(0);
+            rsm.setContent("工单需要支付" + data.getTotalPrice() + "元，请尽快确认！");
+            int insertRsm = repairSystemMessagesService.insertRepairSystemMessages(rsm);
+            if (insertRsm <= 0) {
+                throw new Exception("报价失败！");
+            }
+
+            //添加跟踪记录
+            RepairTrackRecord rtr = new RepairTrackRecord();
+            rtr.setRecordId(data.getRecordId());
+            rtr.setMaintenanceState(eRecordStatu.ToConfirmed.getValue());
+            rtr.setContent("待确认");
+            int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
+            if (insertRtr <= 0) {
+                throw new Exception("报价失败");
             }
         } catch (Exception e) {
             throw new Exception("报价失败！");
@@ -285,7 +298,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 RepairConsumables rcData = new RepairConsumables();
                 if (rc.getId() != null && rc.getId() > 0) {
                     rcData.setId(rc.getId());
-                }else{
+                } else {
                     rcData.setId(0);
                 }
                 rcData.setRecordId(data.getRecordId());
@@ -330,7 +343,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             //oldData集合不在newDatas集合中的内容
             List<Integer> ids = oldDatas.stream().filter(item -> !newDatas.contains(item)).collect(Collectors.toList());
 
-            if(ids.size() > 0){
+            if (ids.size() > 0) {
                 int deleted = repairConsumablesService.deletedConsumableByIds(ids);
                 if (updateRecord <= 0) {
                     throw new Exception("改价失败！");

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

@@ -7,14 +7,13 @@ import com.repair.common.utils.ExcelUtils;
 import com.repair.common.utils.TimeExchange;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.enumModel.eFileType;
-import com.repair.model.enumModel.eRecordStatu;
-import com.repair.model.pojo.*;
+import com.repair.model.pojo.RepairArticleType;
+import com.repair.model.pojo.RepairConsume;
 import com.repair.model.request.insertRepairAssociationRequest;
 import com.repair.model.request.insertRepairConsumeRequest;
 import com.repair.model.request.updateRepairConsumeRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
-import com.repair.model.vo.ChangePriceConsumeVo;
 import com.repair.model.vo.ConsumeVo;
 import com.repair.model.vo.RepairConsumeVo;
 import com.repair.model.vo.RepairSchoolVo;
@@ -23,11 +22,9 @@ import com.repair.services.RepairArticleTypeService;
 import com.repair.services.RepairConsumeService;
 import com.repair.services.RepairRecordService;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hpsf.Decimal;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -35,7 +32,6 @@ import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 

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

@@ -4,15 +4,11 @@ package com.repair.controller;
 import com.repair.api.RepairDispatchRecordControllerAPI;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.pojo.RepairDispatchRecord;
-import com.repair.model.pojo.RepairDispatchRecord;
-import com.repair.model.pojo.RepairDispatchRecord;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.services.RepairDispatchRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

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

@@ -3,25 +3,23 @@ package com.repair.controller;
 
 import com.alibaba.excel.EasyExcel;
 import com.repair.api.RepairEvaluateControllerAPI;
-import com.repair.common.utils.ExcelUtils;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.RepairEvaluate;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.pojo.RepairSystemMessages;
+import com.repair.model.pojo.RepairTrackRecord;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.EvaluateVo;
 import com.repair.services.RepairEvaluateService;
 import com.repair.services.RepairRecordService;
 import com.repair.services.RepairSystemMessagesService;
-import org.apache.poi.ss.formula.functions.T;
+import com.repair.services.RepairTrackRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -47,6 +45,8 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
     @Autowired
     private RepairEvaluateService repairEvaluateService;
     @Autowired
+    private RepairTrackRecordService repairTrackRecordService;
+    @Autowired
     private RepairSystemMessagesService repairSystemMessagesService;
 
     @Override
@@ -89,7 +89,7 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
             for (int i = 0; i < mUserIds.length; i++) {
                 RepairSystemMessages rsm = new RepairSystemMessages();
                 rsm.setIsRead(0);
-                rsm.setRecordId(result);
+                rsm.setRecordId(repairEvaluate.getRecordId());
                 rsm.setRecipientId(Integer.valueOf(mUserIds[i]));
                 rsm.setContent("用户已点评！");
                 rsms.add(rsm);
@@ -98,7 +98,7 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
             //感谢您的点评，非常感谢您对我们的认可及支持。
             RepairSystemMessages rsmU = new RepairSystemMessages();
             rsmU.setIsRead(0);
-            rsmU.setRecordId(result);
+            rsmU.setRecordId(repairEvaluate.getRecordId());
             rsmU.setRecipientId(rr.getUserId());
             rsmU.setContent("感谢您的点评，非常感谢您对我们的认可及支持。");
             rsms.add(rsmU);
@@ -109,6 +109,16 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
                 }
             }
 
+            //添加跟踪记录
+            RepairTrackRecord rtr = new RepairTrackRecord();
+            rtr.setRecordId(repairEvaluate.getRecordId());
+            rtr.setMaintenanceState(eRecordStatu.Finished.getValue());
+            rtr.setContent("用户评价");
+            int insertRtr =repairTrackRecordService.insertRepairTrackRecord(rtr);
+            if(insertRtr <= 0){
+                throw new Exception("评价失败！");
+            }
+
         } catch (Exception e) {
             throw new Exception("评价失败！");
         }

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

@@ -7,18 +7,15 @@ import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.RepairLeaveMessage;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.pojo.RepairSystemMessages;
+import com.repair.model.pojo.RepairTrackRecord;
 import com.repair.model.request.repairLeaveMessageRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.model.vo.RepairLogisticsVo;
-import com.repair.services.RepairLeaveMessageService;
-import com.repair.services.RepairRecordService;
-import com.repair.services.RepairSystemMessagesService;
-import com.repair.services.RepairUserService;
+import com.repair.services.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -40,6 +37,8 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
     @Autowired
     private RepairLeaveMessageService repairLeaveMessageService;
     @Autowired
+    private RepairTrackRecordService repairTrackRecordService;
+    @Autowired
     private RepairRecordService repairRecordService;
     @Autowired
     private RepairUserService repairUserService;
@@ -98,11 +97,11 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
 
         //只有待确认能转后勤
         RepairRecord rr = repairRecordService.getRepairById(rlmr.getRecordId());
-        if(rr == null){
+        if (rr == null) {
             return CommonResult.fail("报修单不存在，转后勤失败");
         }
 
-        if(rr.getMaintenanceState() != eRecordStatu.ToConfirmed.getValue()){
+        if (rr.getMaintenanceState() != eRecordStatu.ToConfirmed.getValue()) {
             return CommonResult.fail("待确认的报修单才能进行转后勤操作");
         }
 
@@ -133,10 +132,10 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
             messages.add(rsm);
         }
 
-        try{
+        try {
             boolean result = repairLeaveMessageService.inserBatchLeaveMessage(datas);
 
-            if(!result){
+            if (!result) {
                 throw new Exception("转后勤失败！");
             }
             //将工单状态更改为待处理
@@ -144,16 +143,25 @@ public class RepairLeaveMessageController implements RepairLeaveMessageControlle
             rr.setMaintenanceState(eRecordStatu.ToLogistics.getValue());
 
             int updateR = repairRecordService.updateRepairRecord(rr);
-            if(updateR <= 0){
+            if (updateR <= 0) {
                 throw new Exception("转后勤失败！");
             }
 
+            boolean insertRsm = repairSystemMessagesService.inserBatchSystemMessage(messages);
+            if (!insertRsm) {
+                throw new Exception("报修单转后勤失败！");
+            }
 
-            boolean insertRsm =repairSystemMessagesService.inserBatchSystemMessage(messages);
-            if(!insertRsm){
-                throw new Exception("报修单提交失败！");
+            //添加跟踪记录
+            RepairTrackRecord rtr = new RepairTrackRecord();
+            rtr.setRecordId(rlmr.getRecordId());
+            rtr.setMaintenanceState(eRecordStatu.ToLogistics.getValue());
+            rtr.setContent("用户转后勤：" + rlmr.getContent());
+            int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
+            if (insertRtr <= 0) {
+                throw new Exception("转后勤失败！");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             throw new Exception("转后勤失败！");
         }
 

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

@@ -1,12 +1,9 @@
 package com.repair.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.repair.api.RepairNoticeSettingControllerAPI;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.enumModel.eIsTop;
-import com.repair.model.enumModel.eStatu;
-import com.repair.model.pojo.RepairAdmin;
 import com.repair.model.pojo.RepairNoticeSetting;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
@@ -16,8 +13,6 @@ import com.repair.services.RepairNoticeSettingService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;

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

@@ -1,9 +1,7 @@
 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.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,7 +28,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
@@ -440,11 +437,30 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
 //      支付订单ID
         Integer repairPayRecordId = rar.getRepairPayRecordId();
-//      总金额
+//      退款金额
         BigDecimal refundPrice = rar.getRefundPrice();
 
         RepairPayRecord repairPayRecord = repairPayRecordService.getById(repairPayRecordId);
 
+//        实退金额不能大于剩余金额
+        Integer recordId = repairPayRecord.getRecordId();
+//        实收金额
+        BigDecimal payPrice = repairPayRecord.getPayPrice();
+        LambdaQueryWrapper<RepairRefundRecord> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(RepairRefundRecord::getRecordId,recordId);
+        List<RepairRefundRecord> refundRecordList = repairRefundRecordService.list(wrapper);
+        BigDecimal refundTotal=new BigDecimal(0);
+        for (RepairRefundRecord repairRefundRecord : refundRecordList) {
+            BigDecimal refundPrice1 = repairRefundRecord.getRefundPrice();
+            refundTotal=refundTotal.add(refundPrice1);
+        }
+
+//        实收金额减总退款金额在减实退金额，不能小于0
+        int i = payPrice.subtract(refundTotal).subtract(refundPrice).compareTo(new BigDecimal(0));
+        if (i<0) {
+            return CommonResult.fail("实退金额有误");
+        }
+
         RepairRefundRecord repairRefundRecord = new RepairRefundRecord();
 
         repairRefundRecord.setRecordId(repairPayRecord.getRecordId());
@@ -552,31 +568,9 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         List<QueryExportVo> queryExportVoList=repairPayRecordService.queryExport(keyWord,startTime,endTime);
 
         List<QueryExportVo> vos = new ArrayList<>();
-        for (QueryExportVo queryExportVo : queryExportVoList) {
-            QueryExportVo vo = new QueryExportVo();
-            BeanUtils.copyProperties(queryExportVo,vo);
-//            退款金额
-            BigDecimal refundTotalPrice = queryExportVo.getRefundTotalPrice();
-            if (ObjectUtils.isEmpty(refundTotalPrice)) {
-                refundTotalPrice=new BigDecimal(0);
-                vo.setRefundTotalPrice(refundTotalPrice);
-            }
-            BigDecimal payPrice = queryExportVo.getPayPrice();
-//            退款金额=0
-            if (refundTotalPrice.compareTo(new BigDecimal(0))==0) {
-                vo.setStatus("已支付");
-            }else if (payPrice.compareTo(refundTotalPrice)==0){
-                vo.setStatus("已退款");
-            }else if (payPrice.compareTo(refundTotalPrice)==1&&refundTotalPrice.compareTo(new BigDecimal(0))==1){
-                vo.setStatus("部分退款");
-            }
 
-            vos.add(vo);
-
-        }
 
         //        导出
-
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("支付成功记录表");
         Row headerRow = sheet.createRow(0);
@@ -589,17 +583,43 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
         headerRow.createCell(6).setCellValue("退款金额");
         headerRow.createCell(7).setCellValue("状态");
 
-        for (int i = 0; i < vos.size(); i++) {
-            QueryExportVo vo = vos.get(i);
-            Row dataRow1 = sheet.createRow(i + 1);
-            dataRow1.createCell(0).setCellValue(vo.getId());
-            dataRow1.createCell(1).setCellValue(vo.getPayTime());
-            dataRow1.createCell(2).setCellValue(vo.getRecordNo());
-            dataRow1.createCell(3).setCellValue(vo.getPayNo());
-            dataRow1.createCell(4).setCellValue(vo.getUserName());
-            dataRow1.createCell(5).setCellValue( vo.getPayPrice().toString());
-            dataRow1.createCell(6).setCellValue( vo.getRefundTotalPrice().toString());
-            dataRow1.createCell(7).setCellValue(vo.getStatus());
+
+        if (ObjectUtils.isNotEmpty(queryExportVoList)&&queryExportVoList.size()>0) {
+
+            for (QueryExportVo queryExportVo : queryExportVoList) {
+                QueryExportVo vo = new QueryExportVo();
+                BeanUtils.copyProperties(queryExportVo, vo);
+//            退款金额
+                BigDecimal refundTotalPrice = queryExportVo.getRefundTotalPrice();
+                if (ObjectUtils.isEmpty(refundTotalPrice)) {
+                    refundTotalPrice = new BigDecimal(0);
+                    vo.setRefundTotalPrice(refundTotalPrice);
+                }
+                BigDecimal payPrice = queryExportVo.getPayPrice();
+//            退款金额=0
+                if (refundTotalPrice.compareTo(new BigDecimal(0)) == 0) {
+                    vo.setStatus("已支付");
+                } else if (payPrice.compareTo(refundTotalPrice) == 0) {
+                    vo.setStatus("已退款");
+                } else if (payPrice.compareTo(refundTotalPrice) == 1 && refundTotalPrice.compareTo(new BigDecimal(0)) == 1) {
+                    vo.setStatus("部分退款");
+                }
+
+                vos.add(vo);
+            }
+            for (int i = 0; i < vos.size(); i++) {
+                QueryExportVo vo = vos.get(i);
+                Row dataRow1 = sheet.createRow(i + 1);
+                dataRow1.createCell(0).setCellValue(vo.getId());
+                dataRow1.createCell(1).setCellValue(vo.getPayTime());
+                dataRow1.createCell(2).setCellValue(vo.getRecordNo());
+                dataRow1.createCell(3).setCellValue(vo.getPayNo());
+                dataRow1.createCell(4).setCellValue(vo.getUserName());
+                dataRow1.createCell(5).setCellValue( vo.getPayPrice().toString());
+                dataRow1.createCell(6).setCellValue( vo.getRefundTotalPrice().toString());
+                dataRow1.createCell(7).setCellValue(vo.getStatus());
+            }
+
         }
 
         // 将工作簿写入文件

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

@@ -4,14 +4,11 @@ package com.repair.controller;
 import com.repair.api.RepairReceivingControllerAPI;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.pojo.RepairReceiving;
-import com.repair.model.pojo.RepairReceiving;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.services.RepairReceivingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

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

@@ -9,7 +9,6 @@ import com.repair.model.result.PageUtils;
 import com.repair.services.RepairRefundRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

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

@@ -14,13 +14,9 @@ import com.repair.services.RepairShiftSettingsService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
-import java.time.Duration;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;

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

@@ -10,7 +10,6 @@ import com.repair.model.vo.SystemMessagePageVo;
 import com.repair.services.RepairSystemMessagesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

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

@@ -3,14 +3,11 @@ package com.repair.controller;
 
 import com.repair.api.RepairSystemSettingControllerAPI;
 import com.repair.common.utils.paramUtils;
-import com.repair.model.pojo.RepairAdmin;
 import com.repair.model.pojo.RepairSystemSetting;
 import com.repair.model.result.CommonResult;
 import com.repair.services.RepairSystemSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

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

@@ -4,14 +4,11 @@ package com.repair.controller;
 import com.repair.api.RepairTrackRecordControllerAPI;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.pojo.RepairTrackRecord;
-import com.repair.model.pojo.RepairTrackRecord;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.services.RepairTrackRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

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

@@ -4,14 +4,11 @@ package com.repair.controller;
 import com.repair.api.RepairTransferRecordControllerAPI;
 import com.repair.common.utils.paramUtils;
 import com.repair.model.pojo.RepairTransferRecord;
-import com.repair.model.pojo.RepairTransferRecord;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.services.RepairTransferRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**

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

@@ -2,7 +2,6 @@ package com.repair.controller;
 
 import com.repair.api.RepairUserControllerAPI;
 import com.repair.common.utils.paramUtils;
-import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.enumModel.eUserZZ;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.pojo.RepairUser;
@@ -17,7 +16,6 @@ import com.repair.services.RepairUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.SimpleDateFormat;

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

@@ -10,7 +10,6 @@ import com.repair.model.result.PageUtils;
 import com.repair.model.vo.RepairWorkTypeVo;
 import com.repair.services.RepairWorkTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -1,13 +1,11 @@
 package com.repair.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairAdmin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairAdmin;
 import org.springframework.stereotype.Repository;
 
 /*

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairArea;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairArea;
 import com.repair.model.vo.RepairSchoolVo;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairArticleType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairArticleType;
 import com.repair.model.vo.RepairArticleChildVo;
 import com.repair.model.vo.RepairWorkTypeVo;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,18 +1,13 @@
 package com.repair.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.repair.model.pojo.RepairClassesSettings;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairClassesSettings;
 import com.repair.model.vo.ClassesDataVo;
 import com.repair.model.vo.ClassesSettingVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairClose;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairClose;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairCollaborateRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairCollaborateRecord;
 import com.repair.model.vo.CollaborateDetailVo;
 import com.repair.model.vo.CollaborateRecordVo;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,8 +1,8 @@
 package com.repair.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairConsumables;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.repair.model.vo.ChangeConsumesVo;
 import com.repair.model.vo.ConsumableExcelVo;
 import com.repair.model.vo.ConsumablePageVo;

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

@@ -1,8 +1,8 @@
 package com.repair.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairConsume;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.repair.model.vo.ConsumeVo;
 import com.repair.model.vo.RepairArticleConsumeVo;
 import com.repair.model.vo.RepairConsumeVo;

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairDispatchRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairDispatchRecord;
 import com.repair.model.vo.RepairCardNumberVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

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

@@ -1,15 +1,13 @@
 package com.repair.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairEvaluate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.repair.model.vo.EvaluateVo;
 import com.repair.model.vo.RecordEvaluateVo;
-import com.repair.model.vo.RepairConsumeVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairLeaveMessage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairLeaveMessage;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -1,8 +1,8 @@
 package com.repair.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairNoticeSetting;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.repair.model.vo.NoticePageVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairPayRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairPayRecord;
 import com.repair.model.vo.QueryExportVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairReceiving;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairReceiving;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -1,8 +1,8 @@
 package com.repair.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.repair.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -64,7 +64,7 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
     MasterHomepageVo queryMasterHomeCount(@Param("userId") Integer userId);
 
     MasterHomepageVo queryLogisticHomeCount(@Param("schoolId") Integer schoolId);
-	
+
 	List<RepairCampusVo> repairCampusTotal();
 
     List<RepairCampusVo> repairCampus(String startTime, String endTime);
@@ -80,4 +80,12 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
     List<RepairAreaVo> repairAreaExport(String startTime, String endTime);
 
     List<MaintenanceGoodsVo>  maintenanceGoodsExport(String startTime, String endTime);
+
+    DetailsVo queryDetailData(@Param("recordId") Integer recordId);
+	
+    RepairAnalysisVo repairAnalysis(@Param("startTime")String startTime,@Param("endTime") String endTime);
+
+    Integer queryTimeOut(@Param("startTime")String startTime,@Param("endTime") String endTime);
+
+    RepairSummarizingVo repairSummarizing(@Param("startTime")String startTime,@Param("endTime") String endTime);
 }

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairRefundRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairRefundRecord;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairSchool;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairSchool;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairShiftSettings;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairShiftSettings;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -1,9 +1,8 @@
 package com.repair.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairSystemMessages;
-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;

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairSystemSetting;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairSystemSetting;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -1,9 +1,13 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairTrackRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairTrackRecord;
+import com.repair.model.vo.TrackDetailsVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -14,5 +18,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface RepairTrackRecordMapper extends BaseMapper<RepairTrackRecord> {
-
+    List<TrackDetailsVo> queryDetailData(@Param("recordId") Integer recordId);
 }

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairTransferRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairTransferRecord;
 import com.repair.model.vo.TransferDetailVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

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

@@ -1,8 +1,8 @@
 package com.repair.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.repair.model.pojo.RepairUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.repair.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.RepairWorkType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.RepairWorkType;
 import com.repair.model.vo.RepairWorkTypeVo;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,7 +1,7 @@
 package com.repair.mapper;
 
-import com.repair.model.pojo.WxAccessToken;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.repair.model.pojo.WxAccessToken;
 import org.springframework.stereotype.Repository;
 
 /**

src/main/java/com/repair/model/enumModel/eApprovalStatu.java

@@ -2,12 +2,9 @@ package com.repair.model.enumModel;
 
 
 public enum eApprovalStatu {
-    //    拒绝
-    Refuse(0),
-    //    同意
-    Agree(1),
-    //    待审批
-    ApprovalPending(2) ;
+    Refuse(0),//拒绝
+    Agree(1),//同意
+    ApprovalPending(2) ;//待审批
 
     private int value;
 

src/main/java/com/repair/model/enumModel/eDispatchResult.java

@@ -1,10 +1,8 @@
 package com.repair.model.enumModel;
 
 public enum eDispatchResult {
-    //    未失效
-    NotExpired(0),
-    //    已失效
-    Expired(1);
+    NotExpired(0),//未失效
+    Expired(1);//已失效
 
     private Integer value;
 

src/main/java/com/repair/model/enumModel/eDispatchType.java

@@ -1,12 +1,12 @@
 package com.repair.model.enumModel;
 
 public enum eDispatchType {
-//    派单
-    Send(0),
-//    协作
-    Cooperation(1),
-//    转单
-    Transfer(2) ;
+
+    Send(0),//派单
+
+    Cooperation(1),//协作
+
+    Transfer(2) ;//转单
 
     private int value;
 

src/main/java/com/repair/model/enumModel/eIsSuccess.java

@@ -1,18 +1,21 @@
 package com.repair.model.enumModel;
 
+/**
+ * 是否支付成功
+ * 未支付/等待支付：1
+ * 支付成功：2
+ * 支付失败：3
+ */
 public enum eIsSuccess {
-//    进行中
-    UnderWay(0),
-    //    成功
-    Succeed(1),
-    //    失败
-    Fail(2);
+    UnderWay(1),//未支付/等待支付
+    Succeed(2),//成功
+    Fail(3);//失败
 
 
     private int value;
 
     eIsSuccess(int value) {
-        this.value=value;
+        this.value = value;
     }
 
 

src/main/java/com/repair/model/enumModel/ePayPageStatu.java

@@ -1,12 +1,9 @@
 package com.repair.model.enumModel;
 
 public enum ePayPageStatu {
-    //    已支付
-    HavePaid(0),
-    //部分退款
-    Rebates(1),
-    //    已退款
-    Refunded(2);
+    HavePaid(0),//已支付
+    Rebates(1),//部分退款
+    Refunded(2);//已退款
 
     private int value;
     ePayPageStatu(int value) {

src/main/java/com/repair/model/pojo/RepairAdmin.java

@@ -2,18 +2,7 @@ package com.repair.model.pojo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.baomidou.mybatisplus.annotation.IdType;
-
-import java.beans.Transient;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
@@ -24,6 +13,9 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairArea.java

@@ -1,12 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairArticleType.java

@@ -1,13 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairClassesSettings.java

@@ -1,20 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +9,10 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.Date;
+
 /**
  * <p>
  *

src/main/java/com/repair/model/pojo/RepairClose.java

@@ -1,14 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,6 +8,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  *

src/main/java/com/repair/model/pojo/RepairCollaborateRecord.java

@@ -1,22 +1,16 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairConsumables.java

@@ -1,15 +1,6 @@
 package com.repair.model.pojo;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +10,9 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairConsume.java

@@ -1,14 +1,6 @@
 package com.repair.model.pojo;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,6 +9,9 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairDispatchRecord.java

@@ -1,12 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairEvaluate.java

@@ -1,15 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairLeaveMessage.java

@@ -1,12 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairNoticeSetting.java

@@ -1,15 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairPayRecord.java

@@ -1,14 +1,6 @@
 package com.repair.model.pojo;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,6 +9,9 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairReceiving.java

@@ -1,13 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairRecord.java

@@ -1,22 +1,16 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.sql.Blob;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  *

src/main/java/com/repair/model/pojo/RepairRefundRecord.java

@@ -1,14 +1,6 @@
 package com.repair.model.pojo;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,6 +9,9 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairSchool.java

@@ -1,13 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairShiftSettings.java

@@ -1,15 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-
-import java.sql.Time;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairSystemMessages.java

@@ -1,13 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairSystemSetting.java

@@ -1,15 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairTrackRecord.java

@@ -1,13 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairTransferRecord.java

@@ -1,13 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairUser.java

@@ -1,15 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +9,8 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/RepairWorkType.java

@@ -1,13 +1,6 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

src/main/java/com/repair/model/pojo/WxAccessToken.java

@@ -1,19 +1,15 @@
 package com.repair.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  *