新加接口

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

@@ -1,6 +1,7 @@
 package com.repair.api;
 
 import com.repair.model.pojo.RepairPayRecord;
+import com.repair.model.request.repairPayRequest;
 import com.repair.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,4 +28,13 @@ public interface RepairPayRecordControllerAPI {
     @GetMapping(value = "/deleterepairPayRecordById")
     @ApiOperation(value = "根据ID删除指定支付记录", notes = "根据ID删除指定支付记录", httpMethod = "GET")
     CommonResult deleterepairPayRecordById(@RequestParam int id);
+
+    @PostMapping(value = "/repairPayment")
+    @ApiOperation(value = "支付接口", notes = "支付接口", httpMethod = "POST")
+    CommonResult repairPayment(@Validated @RequestBody repairPayRequest rpr, BindingResult bindingResult);
+
+    @GetMapping(value = "/queryProsperityRepairPayRecords")
+    @ApiOperation(value = "支付成功记录分页数据", notes = "支付成功记录分页数据", httpMethod = "GET")
+    CommonResult queryProsperityRepairPayRecords(@RequestHeader  @RequestParam int currentPage, @RequestParam int pageCount, String name,String startTime,String endTime);
+
 }

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

@@ -10,6 +10,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+
 
 @RequestMapping("/api/repairRecord")
 @Api(tags = {"RepairRecordController"}, value = "报修记录")
@@ -72,9 +75,13 @@ public interface RepairRecordControllerAPI {
     CommonResult queryPendingOrder(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam int userId);
 
     @GetMapping(value = "/receiveOrders")
-    @ApiOperation(value = "接单", notes = "接单", httpMethod = "GET")
+    @ApiOperation(value = "待处理池接单", notes = "待处理池接单", httpMethod = "GET")
     CommonResult receiveOrders(@RequestParam int recordId, @RequestParam int userId) throws Exception;
 
+    @GetMapping(value = "/receiveOwnOrders")
+    @ApiOperation(value = "维修师傅接单", notes = "维修师傅接单", httpMethod = "GET")
+    CommonResult receiveOwnOrders(@RequestParam int recordId, @RequestParam int userId) throws Exception;
+
     @GetMapping(value = "/closeOrder")
     @ApiOperation(value = "关单", notes = "关单", httpMethod = "GET")
     CommonResult closeOrders(@RequestParam int recordId, @RequestParam String userId, @RequestParam String reason);
@@ -109,7 +116,7 @@ public interface RepairRecordControllerAPI {
 
     @PostMapping(value = "/cooperationOrders")
     @ApiOperation(value = "协作审核", notes = "协作审核", httpMethod = "POST")
-    CommonResult cooperationOrders(@RequestBody cooperationOrdersRequest cor, BindingResult bindingResult) throws Exception;
+    CommonResult cooperationOrders(@RequestBody cooperationOrdersRequest cor, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
 
     @GetMapping(value = "/details")
     @ApiOperation(value = "详情", notes = "详情", httpMethod = "GET")
@@ -117,7 +124,7 @@ public interface RepairRecordControllerAPI {
 
     @PostMapping(value = "/transfer")
     @ApiOperation(value = "转单审核", notes = "转单审核", httpMethod = "POST")
-    CommonResult transfer(@RequestBody transferRequest transferRequest, BindingResult bindingResult) throws Exception;
+    CommonResult transfer(@RequestBody transferRequest transferRequest,@RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception;
 
     @GetMapping(value = "/alterPriceShow")
     @ApiOperation(value = "改价显示", notes = "改价显示", httpMethod = "GET")
@@ -146,4 +153,8 @@ public interface RepairRecordControllerAPI {
     @PostMapping(value = "/mobileReply")
     @ApiOperation(value = "移动端回复", notes = "移动端回复", httpMethod = "POST")
     CommonResult mobileReply(@RequestBody MobileRevertRequest mrr, BindingResult bindingResult) throws Exception;
+
+    @GetMapping(value = "/reportExport")
+    @ApiOperation(value = "报表导出", notes = "报表导出", httpMethod = "GET")
+    void reportExport(HttpServletResponse response,String keyWord, String startTime, String endTime, @RequestParam Integer schoolId, @RequestParam Integer state, @RequestHeader("user_head") String userhead) throws Exception;
 }

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

@@ -340,7 +340,6 @@ public class TimeExchange {
         DateFormat dateFormat = new SimpleDateFormat(FormatStr);
         try {
             dateStr = dateFormat.format(time);
-            System.out.println(dateStr);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -1,20 +1,34 @@
 package com.repair.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.repair.api.RepairPayRecordControllerAPI;
+import com.repair.common.utils.TimeExchange;
 import com.repair.common.utils.paramUtils;
+import com.repair.model.enumModel.eRecordStatu;
 import com.repair.model.pojo.RepairPayRecord;
+import com.repair.model.pojo.RepairRecord;
+import com.repair.model.request.repairPayRequest;
 import com.repair.model.result.CommonResult;
 import com.repair.model.result.PageUtils;
 import com.repair.services.RepairPayRecordService;
+import com.repair.services.RepairRecordService;
 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.math.BigDecimal;
+import java.util.Date;
+
+import static com.repair.common.utils.StrUtils.getUUIDBits;
+
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -24,6 +38,8 @@ import org.springframework.web.bind.annotation.RestController;
 public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
     @Autowired
+    private RepairRecordService repairRecordService;
+    @Autowired
     private RepairPayRecordService repairPayRecordService;
 
     @Override
@@ -68,5 +84,150 @@ public class RepairPayRecordController implements RepairPayRecordControllerAPI {
 
         return result > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
     }
+
+    @Override
+    public CommonResult repairPayment(repairPayRequest rpr, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        RepairRecord data = repairRecordService.getRepairById(rpr.getRecordId());
+        if (data == null) {
+            return CommonResult.fail("维修单数据异常,支付失败");
+        }
+
+        if (data.getMaintenanceState() != eRecordStatu.ToConfirmed.getValue()) {
+            return CommonResult.fail("订单状态异常，支付失败");
+        }
+
+        if (data.getPrice().compareTo(rpr.getPrice()) != 0) {
+            return CommonResult.fail("支付金额与订单金额不一致");
+        }
+
+        //查找是否存在支付成功的数据，有的话提示已经支付过了
+        RepairPayRecord payData = repairPayRecordService.getRepairPaySuccessByRecordId(rpr.getRecordId());
+        if (payData != null) {
+            return CommonResult.fail("该订单已支付，请勿重复操作");
+        }
+        String payResult = null;
+        try {
+            //支付金额和订单都为0元的时候不唤起支付模块
+            payResult = notifyPay(TimeExchange.DateToString(new Date(), "yyyyMMddHHmmss"), data.getRecordNo(), rpr.getPrice().toString(), getUUIDBits(15), "02", "2", "1234567891");
+            if (!payResult.equals("success")) {
+                return CommonResult.fail("支付失败");
+            }
+        } catch (Exception e) {
+            return CommonResult.fail("支付失败");
+        }
+
+        return CommonResult.ok("支付成功");
+    }
+
+    /**
+     * 支付回调接口
+     *
+     * @param orderDate   交易日期时间 格式为：yyyyMMddHHmmss 24小时制
+     * @param orderNo     订单号
+     * @param amount      订单金额
+     * @param jylsh       支付平台交易流水号
+     * @param tranStat    订单支付状态
+     * @param return_type 通知类型
+     * @param sign        订单签名数据
+     * @return
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public String notifyPay(String orderDate, String orderNo, String amount, String jylsh, String tranStat, String return_type, String sign) throws Exception {
+
+        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
+
+            RepairPayRecord data = repairPayRecordService.queryPaymentData(orderNo);
+
+            RepairRecord rr = repairRecordService.queryRepairByRecordno(orderNo);
+            if (rr == null) {
+                throw new Exception("支付回调失败！");
+            }
+
+            if (rr.getPrice().compareTo(new BigDecimal(amount)) != 0) {
+                throw new Exception("支付回调失败！");
+            }
+            //是否支付成功 未支付/等待支付：1；支付成功：2；支付失败：3
+            //可能支付平台会重复回调 所以原来支付成功的订单就不用处理了
+            if (data != null) {
+                if (data.getIsSuccess().equals(2)) {
+                    return "success";
+                }
+                data.setIsSuccess(Integer.valueOf(tranStat));
+                data.setRemark(data.getRemark() + "/n" + tranStat);
+
+                int updateData = repairPayRecordService.updateRepairPayRecord(data);
+                if (updateData <= 0) {
+                    throw new Exception("支付回调失败！");
+                }
+
+            } else {
+                data = new RepairPayRecord();
+                data.setRecordId(rr.getId());
+                data.setUserId(rr.getUserId());
+                data.setPayNo(jylsh);
+                data.setPayPrice(new BigDecimal(amount));
+                data.setIsSuccess(Integer.valueOf(tranStat));
+                data.setRemark(return_type);
+                int insertData = repairPayRecordService.insertRepairPayRecord(data);
+
+                if (insertData <= 0) {
+                    throw new Exception("支付回调失败！");
+                }
+            }
+
+            if (tranStat.equals("02")) {
+                //用户成功支付完成后将维修单状态由待确认改为维修中
+                rr.setMaintenanceState(eRecordStatu.Maintenance.getValue());
+                int rrData = repairRecordService.updateRepairRecord(rr);
+                if (rrData <= 0) {
+                    throw new Exception("支付回调失败！");
+                }
+            }
+
+        } catch (Exception e) {
+            throw new Exception("支付回调失败！");
+        }
+
+        return "success";
+    }
+	
+	@Override
+    public CommonResult queryProsperityRepairPayRecords(int currentPage, int pageCount, String name, String startTime, String endTime) {
+
+        if (startTime != null && endTime != null) {
+            try {
+                startTime = TimeExchange.getStartOfDayStr(TimeExchange.StringToDate(startTime, "yyyy-MM-dd"));
+                endTime = TimeExchange.getEndOfDayStr(TimeExchange.StringToDate(endTime, "yyyy-MM-dd"));
+            } catch (Exception e) {
+            }
+        }
+
+
+        if (currentPage <= 0 && pageCount <= 0) {
+            currentPage=1;
+            pageCount=10;
+        }
+
+        LambdaQueryWrapper<RepairPayRecord> wrapper=new LambdaQueryWrapper<>();
+
+
+
+        repairPayRecordService.page(new Page<>(currentPage,pageCount),wrapper);
+
+        return null;
+    }
 }
 

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

@@ -27,5 +27,5 @@ public interface RepairConsumeMapper extends BaseMapper<RepairConsume> {
 
     List<RepairArticleConsumeVo> queryArticleConsumes(@Param("schoolId") Integer schoolId, @Param("keyWork") String keyWork, @Param("findInSet") String findInSet);
 
-    List<RepairArticleConsumeVo> queryArticleConsumesName(String sss,int schoolId);
+    List<RepairArticleConsumeVo> queryArticleConsumesName(@Param("findInSet")String findInSet,@Param("schoolId")int schoolId);
 }

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

@@ -2,6 +2,7 @@ package com.repair.mapper;
 
 import com.repair.model.pojo.RepairPayRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,5 +15,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface RepairPayRecordMapper extends BaseMapper<RepairPayRecord> {
-
+    RepairPayRecord queryPaymentData(@Param("recordNo") String recordNo);
 }

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

@@ -7,6 +7,8 @@ import com.repair.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -55,4 +57,7 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
 
     IPage<RepairTechnicianVo> queryTeamWorkClosed(IPage<RepairTechnicianVo> page,@Param("schoolId") Integer schoolId);
 
+    List<ReportExportVo> queryNotTimeoutReportExport(String stateStr, String keyWord, String startTime, String endTime, Integer schoolId);
+
+    List<ReportExportVo> queryTimeoutReportExport(String keyWord, String startTime, String endTime, Integer schoolId);
 }

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

@@ -1,14 +1,15 @@
 package com.repair.model.enumModel;
 
 public enum eDispatchResult {
-//    未失效
+    //    未失效
     NotExpired(0),
-//    已失效
+    //    已失效
     Expired(1);
 
     private Integer value;
+
     eDispatchResult(int value) {
-        this.value=value;
+        this.value = value;
     }
 
     public int getValue() {

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

@@ -51,7 +51,7 @@ public class RepairCollaborateRecord implements Serializable {
 
     @ApiModelProperty(value = "审批操作人ID")
     @NotNull(message = "审批操作人不能为空")
-    private String approverId;
+    private Integer approverId;
 
     @ApiModelProperty(value = "语音 可能做成语音文件上传的方式 然后这个字段记录语音文件名")
     @NotBlank(message = "语音不能为空")

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

@@ -59,7 +59,7 @@ public class RepairTransferRecord implements Serializable {
 
     @ApiModelProperty(value = "审批操作人ID")
     @NotNull(message = "审批操作人不能为空")
-    private String approverId;
+    private Integer approverId;
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)

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

@@ -2,22 +2,35 @@ package com.repair.model.request;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 public class cooperationOrdersRequest {
 
-    @NotNull(message = "协作记录ID不能为空")
-    private Integer collaborateId;
-
-    @NotNull(message = "协作人ID不能为空")
-    private String[] collaborator;
-
-    @NotNull(message = "审批人ID不能为空")
-    private String approverId;
-
-    @NotNull(message = "审批人状态不能为空")
+    /**
+     * 数据ID
+     */
+    @NotNull(message = "数据ID不能为空")
+    private Integer id;
+
+    /**
+     * 协作对象集合
+     */
+    @NotEmpty(message = "协作人ID不能为空")
+    private List<Integer> collaborator;
+
+    /**
+     * 审批状态
+     * 拒绝：0
+     * 同意：1
+     */
+    @NotNull(message = "审批状态不能为空")
     private Integer approverStatu;
 
+    /**
+     * 备注
+     */
     private String remark;
 }

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

@@ -0,0 +1,34 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/8/10 星期四 8:35
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class repairPayRequest {
+    /**
+     * 报修记录ID
+     */
+    @NotNull(message = "报修记录ID不能为空")
+    private Integer recordId;
+
+    /**
+     * 支付人员ID
+     */
+    @NotNull(message = "用户不能为空")
+    private Integer userId;
+
+    /**
+     * 支付金额 要带两位小数 否则比较会不一致
+     */
+    @NotNull(message = "支付金额不能为空")
+    private BigDecimal price;
+
+}

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

@@ -0,0 +1,32 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class transferOrderRequest {
+
+    /**
+     * 报修记录ID
+     */
+    @NotNull(message = "报修记录ID不能为空")
+    private Integer recordId;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空")
+    private Integer userId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 转单语音说明
+     */
+    private String voice;
+
+}

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

@@ -7,22 +7,29 @@ import javax.validation.constraints.NotNull;
 @Data
 public class transferRequest {
 
-    //    转单表id
+    /**
+     * 数据ID
+     */
     @NotNull(message = "转单表不能为空")
-    private Integer transferId;
+    private Integer id;
 
-    //    审批人Id
-    @NotNull(message = "审批人不能为空")
-    private String approverId;
-
-    //  备注
+    /**
+     * 备注
+     */
     private String remark;
 
-    //    派单师傅Id
-    @NotNull(message = "派单师傅不能为空")
+    /**
+     * 被派单师傅ID
+     */
+    @NotNull(message = "被派单师傅不能为空")
     private Integer userId;
 
-    @NotNull(message = "审批人状态不能为空")
+    /**
+     * 审批状态
+     * 拒绝：0
+     * 同意：1
+     */
+    @NotNull(message = "审批状态不能为空")
     private Integer approverStatu;
 
 }

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

@@ -34,11 +34,6 @@ public class MyRepairRecordVo {
     private Date reportTime;
 
     /**
-     * 派单时间
-     */
-    private Date dispatchTime;
-
-    /**
      * 报修姓名
      */
     private String userName;

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

@@ -0,0 +1,59 @@
+package com.repair.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ReportExportVo {
+    /**
+     * 工单编号
+     */
+    private String recordNo;
+    /**
+     * 报修区域
+     */
+    private String areaName;
+
+    /**
+     * 姓名
+     */
+    private String userName;
+
+    /**
+     * 电话
+     */
+    private String userPhone;
+
+    /**
+     * 报修物品
+     */
+    private String articleName;
+
+    /**
+     * 故障描述
+     */
+    private String description;
+
+    /**
+     * 订单维修状态
+     */
+    @JsonIgnore
+    private int maintenanceState;
+
+    /**
+     * 状态
+     */
+    private String state;
+
+    /**
+     * 报修时间
+     */
+    private Date reportTime;
+
+    /**
+     * 技术员
+     */
+    private String maintenancerName;
+}

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

@@ -35,5 +35,5 @@ public interface RepairConsumeService extends IService<RepairConsume> {
 
     List<RepairArticleConsumeVo> queryArticleConsumes(Integer schoolId, String keyWork, String findInSet);
 
-    List<RepairArticleConsumeVo> queryArticleConsumesName(String sss,int schoolId);
+    List<RepairArticleConsumeVo> queryArticleConsumesName(String findInSet,int schoolId);
 }

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

@@ -33,4 +33,8 @@ public interface RepairDispatchRecordService extends IService<RepairDispatchReco
     List<RepairDispatchRecord> queryRepairDispatch(List<Integer> recordIds);
 
     int queryDispatchCount(Integer recordId);
+
+    RepairDispatchRecord queryOwnRepairDispatch(Integer recordId, Integer userId);
+
+    boolean insertDispatchBatch(List<RepairDispatchRecord> rdr);
 }

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

@@ -26,4 +26,8 @@ public interface RepairPayRecordService extends IService<RepairPayRecord> {
     RepairPayRecord getRepairById(int id);
 
     List<RepairPayRecord> getRepairs();
+
+    RepairPayRecord getRepairPaySuccessByRecordId(int recordId);
+
+    RepairPayRecord queryPaymentData(String recordNo);
 }

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

@@ -2,13 +2,14 @@ package com.repair.services;
 
 import com.repair.model.pojo.RepairReceiving;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.repair.model.pojo.RepairRecord;
 import com.repair.model.result.PageUtils;
 
 import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author ceshi
@@ -26,4 +27,6 @@ public interface RepairReceivingService extends IService<RepairReceiving> {
     RepairReceiving getRepairById(int id);
 
     List<RepairReceiving> getRepairs();
+
+    int updateRepairByRecordId(Integer recordId, RepairReceiving rr);
 }

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

@@ -69,4 +69,10 @@ public interface RepairRecordService extends IService<RepairRecord> {
     PageUtils<RepairTechnicianVo> queryTeamWorkTimeout(int currentPage, int pageCount, Integer schoolId, String dateNow);
 
     PageUtils<RepairTechnicianVo> queryTeamWorkClosed(int currentPage, int pageCount, Integer schoolId);
+
+    List<ReportExportVo> queryNotTimeoutReportExport(String stateStr, String keyWord, String startTime, String endTime, Integer schoolId);
+
+    RepairRecord queryRepairByRecordno(String recordNo);
+
+    List<ReportExportVo> queryTimeoutReportExport(String keyWord, String startTime, String endTime, Integer schoolId);
 }

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

@@ -3,6 +3,7 @@ package com.repair.services.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.repair.model.pojo.RepairConsumables;
 import com.repair.model.pojo.RepairDispatchRecord;
 import com.repair.mapper.RepairDispatchRecordMapper;
 import com.repair.model.result.PageUtils;
@@ -89,4 +90,20 @@ public class RepairDispatchRecordServiceImpl extends ServiceImpl<RepairDispatchR
         Integer result = repairDispatchRecordMapper.selectCount(queryWrapper);
         return result;
     }
+
+    @Override
+    public RepairDispatchRecord queryOwnRepairDispatch(Integer recordId, Integer userId) {
+        QueryWrapper<RepairDispatchRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("record_id",recordId);
+        queryWrapper.eq("users_id",userId);
+        queryWrapper.eq("is_lose_efficacy",0);
+        RepairDispatchRecord result = repairDispatchRecordMapper.selectOne(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public boolean insertDispatchBatch(List<RepairDispatchRecord> rdr) {
+        boolean result = this.saveBatch(rdr);
+        return result;
+    }
 }

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

@@ -64,4 +64,19 @@ public class RepairPayRecordServiceImpl extends ServiceImpl<RepairPayRecordMappe
         List<RepairPayRecord> result = repairPayRecordMapper.selectList(null);
         return result;
     }
+
+    @Override
+    public RepairPayRecord getRepairPaySuccessByRecordId(int recordId) {
+        QueryWrapper<RepairPayRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_id", recordId);
+        queryWrapper.eq("is_success",1);
+        RepairPayRecord result = repairPayRecordMapper.selectOne(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public RepairPayRecord queryPaymentData(String recordNo) {
+        RepairPayRecord result = repairPayRecordMapper.queryPaymentData(recordNo);
+        return result;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.repair.model.pojo.RepairReceiving;
 import com.repair.mapper.RepairReceivingMapper;
+import com.repair.model.pojo.RepairRecord;
 import com.repair.model.result.PageUtils;
 import com.repair.services.RepairReceivingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -64,4 +65,13 @@ public class RepairReceivingServiceImpl extends ServiceImpl<RepairReceivingMappe
         List<RepairReceiving> result = repairReceivingMapper.selectList(null);
         return result;
     }
+
+    @Override
+    public int updateRepairByRecordId(Integer recordId,RepairReceiving rr) {
+        QueryWrapper<RepairReceiving> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_id",recordId);
+        queryWrapper.eq("is_lose_efficacy",0);
+        int result = repairReceivingMapper.update(rr,queryWrapper);
+        return result;
+    }
 }

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

@@ -152,7 +152,7 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
         Page<RepairRecordPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairRecordPageVo> result = repairRecordMapper.queryTimeout(page, keyWord, startTime, endTime,schoolId);
+        IPage<RepairRecordPageVo> result = repairRecordMapper.queryTimeout(page, keyWord, startTime, endTime, schoolId);
         return new PageUtils(result);
     }
 
@@ -234,5 +234,24 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
         return new PageUtils(result);
     }
 
+    @Override
+    public RepairRecord queryRepairByRecordno(String recordNo) {
+        QueryWrapper<RepairRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_no", recordNo);
+        RepairRecord result = repairRecordMapper.selectOne(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<ReportExportVo> queryNotTimeoutReportExport(String stateStr, String keyWord, String startTime, String endTime, Integer schoolId) {
+        List<ReportExportVo> reportExportVos = repairRecordMapper.queryNotTimeoutReportExport(stateStr, keyWord, startTime, endTime, schoolId);
+        return reportExportVos;
+    }
+
+    @Override
+    public List<ReportExportVo> queryTimeoutReportExport(String keyWord, String startTime, String endTime, Integer schoolId) {
+        List<ReportExportVo> reportExportVos = repairRecordMapper.queryTimeoutReportExport(keyWord, startTime, endTime, schoolId);
+        return reportExportVos;
+    }
 
 }

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

@@ -76,4 +76,16 @@
             </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>

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

@@ -1,5 +1,19 @@
 <?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>

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

@@ -24,7 +24,6 @@
         <result property="id" column="id"/>
         <result property="recordNo" column="record_no"/>
         <result property="reportTime" column="report_time"/>
-        <result property="dispatchTime" column="dispatch_time"/>
         <result property="userName" column="user_name"/>
         <result property="userPhone" column="user_phone"/>
         <result property="areaName" column="area_name"/>
@@ -47,7 +46,7 @@
         else null end as timeout_disp_str,
         case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= NOW() and rr.is_duty = 0 when true then '维修超时'
         else null end as timeout_rece_str,
-        rr.id,rr.price,rr.maintenancer_name,rr.maintenancer_phone,rr.record_no,rr.report_time,rr.dispatch_time,rr.user_name,rr.user_phone,rr.area_id
+        rr.id,rr.price,rr.maintenancer_name,rr.maintenancer_phone,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
         as area_name,rr.address,rr.description,rat.name as article_name,rr.image,rr.maintenance_state as state_id from
         repair_record rr
         left join repair_article_type rat on rat.id = rr.article_id
@@ -74,10 +73,9 @@
 
     <select id="queryRepairTechnicianCount" resultType="com.repair.model.vo.MaintenanceTechnicianVo"
             resultMap="repairRecordTechnicianMap">
-        select (select Count(*) from repair_record rr1
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr1.id and
-        rdr.is_lose_efficacy = 0
-        where rr1.maintenance_state = 1 and rr1.deleted = 0) as receiving_count ,(select Count(*) from repair_record rr2
+        select (select Count(*) from repair_record rr
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rdr.users_id = #{userId}
+        where rr.deleted = 0) as receiving_count ,(select Count(*) from repair_record rr2
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = rr2.id and
         rdv.is_lose_efficacy = 0
         where rr2.maintenance_state = 2 and rr2.deleted = 0) as maintenance_count,(select Count(*) as cs from (select rr3.*
@@ -123,9 +121,9 @@
             resultMap="repairRecordTechnicianDataMap">
         select case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} and rr.is_duty = 0 when true then '超时未接' else null end as timeout_str,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
         from repair_record rr
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0 and rdr.receiving_time is null
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 1 and rr.deleted = 0
+        where (rr.maintenance_state = 1 or rr.maintenance_state = 2) and rr.deleted = 0
         order by rr.report_time DESC
     </select>
 
@@ -264,7 +262,7 @@
         <where>
             and rr.deleted = 0
             <if test="schoolId != null and schoolId != ''">
-                and rr.schoolId = #{schoolId}
+                and rr.school_id = #{schoolId}
             </if>
             <if test="stateStr != null and stateStr != ''">
                 and (rr.maintenance_state ${stateStr}
@@ -348,7 +346,7 @@
     </resultMap>
 
     <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 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 and users_id = #{userId}) 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
         from repair_record rr
         left join repair_article_type rat on rat.id = rr.article_id
@@ -489,4 +487,84 @@
         where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state = 9
         order by rr.report_time DESC
     </select>
+<!-- 报表导出获取除已超时外的其他数据获取方式-->
+    <select id="queryNotTimeoutReportExport" resultType="com.repair.model.vo.ReportExportVo">
+        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
+        article_name,
+        rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state
+        from repair_record rr
+        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
+        <where>
+            and rr.deleted = 0
+            <if test="schoolId != null and schoolId != ''">
+                and rr.school_id = #{schoolId}
+            </if>
+            <if test="stateStr != null and stateStr != ''">
+                and (rr.maintenance_state ${stateStr}
+            </if>
+            <if test="keyWord != null and keyWord != ''">
+                and (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like
+                '%' #{keyWord} '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rr.report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        order by rr.report_time desc
+    </select>
+
+    <!-- 报表导出获取除已超时数据获取方式-->
+    <select id="queryTimeoutReportExport" resultType="com.repair.model.vo.ReportExportVo">
+        SELECT * FROM (
+        select 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,
+        rr3.description,rr3.report_time,rr3.maintenancer_name,rr3.maintenance_state
+        from repair_record rr3
+        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr3.article_id
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
+        rdr.is_lose_efficacy = 0
+        and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW()
+        <where>
+            and rr3.maintenance_state = 1 and rr3.deleted = 0 and rr3.is_duty = 0
+            <if test="keyWord != null and keyWord != ''">
+                and (rr3.area_id like '%' #{keyWord} '%' or rr3.user_name like '%' #{keyWord} '%' or rr3.user_phone like
+                '%' #{keyWord} '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rr3.report_time between #{startTime} and #{endTime}
+            </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr3.school_id = #{schoolId}
+            </if>
+        </where>
+        UNION ALL
+        select rr4.user_id,1 as details,rr4.id,rr4.record_no,rr4.area_id as
+        area_name,rr4.user_name,rr4.user_phone,rat.name as
+        article_name,
+        rr4.description,rr4.report_time,rr4.maintenancer_name,rr4.maintenance_state
+        from repair_record rr4
+        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr4.article_id
+        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
+        rdv.is_lose_efficacy = 0
+        and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW()
+        <where>
+            and rr4.maintenance_state = 2 and rr4.deleted = 0 and rr4.is_duty = 0
+            <if test="keyWord != null and keyWord != ''">
+                and (rr4.area_id like '%' #{keyWord} '%' or rr4.user_name like '%' #{keyWord} '%' or rr4.user_phone like
+                '%' #{keyWord} '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rr4.report_time between #{startTime} and #{endTime}
+            </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr4.school_id = #{schoolId}
+            </if>
+        </where>
+        ) t
+        order by t.report_time desc
+    </select>
+
+
+
+
 </mapper>

target/classes/mapper/repair/RepairConsumeMapper.xml

@@ -76,4 +76,16 @@
             </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>

target/classes/mapper/repair/RepairPayRecordMapper.xml

@@ -1,5 +1,19 @@
 <?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>

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -24,7 +24,6 @@
         <result property="id" column="id"/>
         <result property="recordNo" column="record_no"/>
         <result property="reportTime" column="report_time"/>
-        <result property="dispatchTime" column="dispatch_time"/>
         <result property="userName" column="user_name"/>
         <result property="userPhone" column="user_phone"/>
         <result property="areaName" column="area_name"/>
@@ -47,7 +46,7 @@
         else null end as timeout_disp_str,
         case date_add(rdv.receiving_time, interval rdv.maintenance_assess_time minute) &lt;= NOW() and rr.is_duty = 0 when true then '维修超时'
         else null end as timeout_rece_str,
-        rr.id,rr.price,rr.maintenancer_name,rr.maintenancer_phone,rr.record_no,rr.report_time,rr.dispatch_time,rr.user_name,rr.user_phone,rr.area_id
+        rr.id,rr.price,rr.maintenancer_name,rr.maintenancer_phone,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id
         as area_name,rr.address,rr.description,rat.name as article_name,rr.image,rr.maintenance_state as state_id from
         repair_record rr
         left join repair_article_type rat on rat.id = rr.article_id
@@ -74,10 +73,9 @@
 
     <select id="queryRepairTechnicianCount" resultType="com.repair.model.vo.MaintenanceTechnicianVo"
             resultMap="repairRecordTechnicianMap">
-        select (select Count(*) from repair_record rr1
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr1.id and
-        rdr.is_lose_efficacy = 0
-        where rr1.maintenance_state = 1 and rr1.deleted = 0) as receiving_count ,(select Count(*) from repair_record rr2
+        select (select Count(*) from repair_record rr
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.is_lose_efficacy = 0 and rdr.record_id = rr.id and rdr.users_id = #{userId}
+        where rr.deleted = 0) as receiving_count ,(select Count(*) from repair_record rr2
         inner join repair_receiving rdv on rdv.deleted = 0 and rdv.user_id = #{userId} and rdv.record_id = rr2.id and
         rdv.is_lose_efficacy = 0
         where rr2.maintenance_state = 2 and rr2.deleted = 0) as maintenance_count,(select Count(*) as cs from (select rr3.*
@@ -123,9 +121,9 @@
             resultMap="repairRecordTechnicianDataMap">
         select case date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= #{dateNow} and rr.is_duty = 0 when true then '超时未接' else null end as timeout_str,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
         from repair_record rr
-        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.users_id = #{userId} and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0 and rdr.receiving_time is null
         left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
-        where rr.maintenance_state = 1 and rr.deleted = 0
+        where (rr.maintenance_state = 1 or rr.maintenance_state = 2) and rr.deleted = 0
         order by rr.report_time DESC
     </select>
 
@@ -264,7 +262,7 @@
         <where>
             and rr.deleted = 0
             <if test="schoolId != null and schoolId != ''">
-                and rr.schoolId = #{schoolId}
+                and rr.school_id = #{schoolId}
             </if>
             <if test="stateStr != null and stateStr != ''">
                 and (rr.maintenance_state ${stateStr}
@@ -348,7 +346,7 @@
     </resultMap>
 
     <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 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 and users_id = #{userId}) 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
         from repair_record rr
         left join repair_article_type rat on rat.id = rr.article_id
@@ -489,4 +487,84 @@
         where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state = 9
         order by rr.report_time DESC
     </select>
+<!-- 报表导出获取除已超时外的其他数据获取方式-->
+    <select id="queryNotTimeoutReportExport" resultType="com.repair.model.vo.ReportExportVo">
+        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
+        article_name,
+        rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state
+        from repair_record rr
+        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
+        <where>
+            and rr.deleted = 0
+            <if test="schoolId != null and schoolId != ''">
+                and rr.school_id = #{schoolId}
+            </if>
+            <if test="stateStr != null and stateStr != ''">
+                and (rr.maintenance_state ${stateStr}
+            </if>
+            <if test="keyWord != null and keyWord != ''">
+                and (rr.area_id like '%' #{keyWord} '%' or rr.user_name like '%' #{keyWord} '%' or rr.user_phone like
+                '%' #{keyWord} '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rr.report_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+        order by rr.report_time desc
+    </select>
+
+    <!-- 报表导出获取除已超时数据获取方式-->
+    <select id="queryTimeoutReportExport" resultType="com.repair.model.vo.ReportExportVo">
+        SELECT * FROM (
+        select 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,
+        rr3.description,rr3.report_time,rr3.maintenancer_name,rr3.maintenance_state
+        from repair_record rr3
+        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr3.article_id
+        inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr3.id and
+        rdr.is_lose_efficacy = 0
+        and date_add(rdr.assigned_time , interval rdr.acceptance_assess_time minute) &lt;= NOW()
+        <where>
+            and rr3.maintenance_state = 1 and rr3.deleted = 0 and rr3.is_duty = 0
+            <if test="keyWord != null and keyWord != ''">
+                and (rr3.area_id like '%' #{keyWord} '%' or rr3.user_name like '%' #{keyWord} '%' or rr3.user_phone like
+                '%' #{keyWord} '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rr3.report_time between #{startTime} and #{endTime}
+            </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr3.school_id = #{schoolId}
+            </if>
+        </where>
+        UNION ALL
+        select rr4.user_id,1 as details,rr4.id,rr4.record_no,rr4.area_id as
+        area_name,rr4.user_name,rr4.user_phone,rat.name as
+        article_name,
+        rr4.description,rr4.report_time,rr4.maintenancer_name,rr4.maintenance_state
+        from repair_record rr4
+        left join repair_article_type rat on rat.deleted = 0 and rat.id = rr4.article_id
+        inner join repair_receiving rdv on rdv.deleted = 0 and rdv.record_id = rr4.id and
+        rdv.is_lose_efficacy = 0
+        and date_add(rdv.receiving_time , interval rdv.maintenance_assess_time minute) &lt;= NOW()
+        <where>
+            and rr4.maintenance_state = 2 and rr4.deleted = 0 and rr4.is_duty = 0
+            <if test="keyWord != null and keyWord != ''">
+                and (rr4.area_id like '%' #{keyWord} '%' or rr4.user_name like '%' #{keyWord} '%' or rr4.user_phone like
+                '%' #{keyWord} '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                and rr4.report_time between #{startTime} and #{endTime}
+            </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr4.school_id = #{schoolId}
+            </if>
+        </where>
+        ) t
+        order by t.report_time desc
+    </select>
+
+
+
+
 </mapper>

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

@@ -20,6 +20,7 @@ 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
@@ -191,6 +192,7 @@ 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
@@ -235,6 +237,7 @@ 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

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

@@ -121,6 +121,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 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
@@ -175,6 +176,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 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
@@ -206,6 +208,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 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