Accept Merge Request #36: (dev-wxl -> master)

Merge Request: 合并上线

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/repair_backend/git/merge/36

repair_system.iml

@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$" dumb="true">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-  </component>
+<module version="4">
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />

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

@@ -34,7 +34,7 @@ public interface RepairConsumablesControllerAPI {
 
     @GetMapping(value = "/queryRepairConsumablePageList")
     @ApiOperation(value = "耗材记录数据", notes = "耗材记录数据", httpMethod = "GET")
-    CommonResult queryRepairConsumablePageList(@RequestParam int currentPage, @RequestParam int pageCount, String keyWord,String startTime,String endTime);
+    CommonResult queryRepairConsumablePageList(@RequestParam int currentPage, @RequestParam int pageCount,String schoolId, String keyWord,String startTime,String endTime);
 
     @GetMapping(value = "/downloadRepairConsumableExcel")
     @ApiOperation(value = "导出耗材记录数据", notes = "导出耗材记录数据", httpMethod = "GET")

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

@@ -33,7 +33,7 @@ public interface RepairConsumeControllerAPI {
 
     @GetMapping(value = "/queryPageRepairConsume")
     @ApiOperation(value = "耗材管理分页数据", notes = "耗材管理分页数据", httpMethod = "GET")
-    CommonResult queryPageRepairConsumes(@RequestParam int currentPage, @RequestParam int pageCount, String name, String startTime, String endTime);
+    CommonResult queryPageRepairConsumes(@RequestParam int currentPage, @RequestParam int pageCount,String schoolId, String name, String startTime, String endTime);
 
     @GetMapping(value = "/deleteRepairConsumeById")
     @ApiOperation(value = "根据ID删除指定耗材管理", notes = "根据ID删除指定耗材管理", httpMethod = "GET")

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

@@ -20,7 +20,7 @@ public interface RepairEvaluateControllerAPI {
 
     @GetMapping(value = "/queryPageRepairEvaluate")
     @ApiOperation(value = "评价分页数据", notes = "评价分页数据", httpMethod = "GET")
-    CommonResult queryPageRepairEvaluates(@RequestParam int currentPage, @RequestParam int pageCount, String keyWord, String startTime, String endTime);
+    CommonResult queryPageRepairEvaluates(@RequestParam int currentPage, @RequestParam int pageCount,String star, String keyWord, String startTime, String endTime);
 
     @GetMapping(value = "/deleteRepairEvaluateById")
     @ApiOperation(value = "根据ID删除指定评价", notes = "根据ID删除指定评价", httpMethod = "GET")

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

@@ -12,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 @RequestMapping("/api/repairRecord")
@@ -246,4 +247,8 @@ public interface RepairRecordControllerAPI {
     @ApiOperation(value = "获取打印数据", notes = "获取打印数据", httpMethod = "GET")
     CommonResult queryPrintData(@RequestParam int recordId,@RequestHeader("user_head") String userhead);
 
+    @GetMapping(value = "/closePCOrderBeath")
+    @ApiOperation(value = "管理端批量关单", notes = "管理端批量关单", httpMethod = "GET")
+    CommonResult closePCOrderBeath(@RequestParam String recordId, @RequestHeader("user_head") String userhead, @RequestParam String reason, @RequestParam String remark) throws Exception;
+
 }

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

@@ -2,6 +2,8 @@ package com.repair.controller;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.repair.api.RepairConsumablesControllerAPI;
 import com.repair.common.utils.*;
 import com.repair.model.enumModel.eIsSuper;
@@ -20,6 +22,7 @@ import com.repair.services.*;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
@@ -139,7 +142,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
      * @return
      */
     @Override
-    public CommonResult queryRepairConsumablePageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
+    public CommonResult queryRepairConsumablePageList(int currentPage, int pageCount,String schoolId, String keyWord, String startTime, String endTime) {
 
         if (startTime != null && endTime != null) {
             try {
@@ -149,7 +152,7 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             }
         }
 
-        PageUtils<ConsumablePageVo> result = repairConsumablesService.queryConsumablePageList(currentPage, pageCount, keyWord, startTime, endTime);
+        PageUtils<ConsumablePageVo> result = repairConsumablesService.queryConsumablePageList(currentPage, pageCount,schoolId, keyWord, startTime, endTime);
 
         for (ConsumablePageVo data : result.getList()) {
             //校区名称
@@ -159,8 +162,26 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             //当返回值大于0时，表示BigDecimal对象大于指定的数值。
             data.setStatu(data.getTotalPrice().compareTo(BigDecimal.ZERO) > 0 ? "有偿" : "无偿");
         }
-
-        return CommonResult.ok(result);
+        JSONObject jsonObject=(JSONObject) JSONObject.toJSON(result);
+        QueryWrapper<RepairConsumables> ew = new QueryWrapper<>();
+        if(StringUtils.hasText(endTime)&&StringUtils.hasText(startTime)){
+            ew.between("update_time",startTime,endTime);
+        }
+        if (StringUtils.hasText(keyWord)) {
+            String str ="record_id  in (select id from   repair_record rr where  rr.deleted = 0 and rr.record_no like '%" + keyWord + "%')";
+            if(StringUtils.hasText(schoolId)&&StringUtils.hasText(schoolId)){
+                str="record_id  in (select id from   repair_record rr where  rr.deleted = 0 and rr.school_id = "+schoolId+" and rr.record_no like '%" + keyWord + "%')";
+            }
+            String finalStr = str;
+            ew.and(w -> w.like("consume_name", keyWord).or().apply(finalStr));
+        }else if(StringUtils.hasText(schoolId)&&StringUtils.hasText(schoolId)){
+            String str2="record_id  in (select id from   repair_record rr where  rr.deleted = 0  and rr.school_id = "+schoolId+")";
+            ew.apply(str2);
+        }
+        ew.select("IFNULL(sum(number),0) tcont,IFNULL(sum(total_price),0) tprice");
+        Map<String,Object> map=repairConsumablesService.getMap(ew);
+        jsonObject.putAll(map);
+        return CommonResult.ok(jsonObject);
     }
 
     /**

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

@@ -158,7 +158,7 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
      * @return
      */
     @Override
-    public CommonResult queryPageRepairConsumes(int currentPage, int pageCount, String name, String startTime, String endTime) {
+    public CommonResult queryPageRepairConsumes(int currentPage, int pageCount, String schoolId,String name, String startTime, String endTime) {
 
         if (startTime != null && endTime != null) {
             try {
@@ -168,7 +168,7 @@ public class RepairConsumeController implements RepairConsumeControllerAPI {
             }
         }
 
-        PageUtils<RepairConsumeVo> result = repairConsumeService.queryPageRepairConsumes(currentPage, pageCount, name, startTime, endTime);
+        PageUtils<RepairConsumeVo> result = repairConsumeService.queryPageRepairConsumes(currentPage, pageCount,schoolId, name, startTime, endTime);
 
         for (RepairConsumeVo r : result.getList()) {
             if (r.getArticleId() != null) {

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

@@ -145,8 +145,8 @@ public class RepairEvaluateController implements RepairEvaluateControllerAPI {
      * @return
      */
     @Override
-    public CommonResult queryPageRepairEvaluates(@RequestParam int currentPage, @RequestParam int pageCount, String keyWord, String startTime, String endTime) {
-        PageUtils<RepairEvaluate> result = repairEvaluateService.queryPageList(currentPage, pageCount, keyWord, startTime, endTime);
+    public CommonResult queryPageRepairEvaluates(@RequestParam int currentPage, @RequestParam int pageCount,String star, String keyWord, String startTime, String endTime) {
+        PageUtils<RepairEvaluate> result = repairEvaluateService.queryPageList(currentPage, pageCount,star, keyWord, startTime, endTime);
 
         return CommonResult.ok(result);
     }

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

@@ -876,6 +876,9 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             case 4://待审核
                 result = repairRecordService.queryExamineOrderList(currentPage, pageCount, userId, user.getSchoolId());
                 break;
+            case 5://待支付、待确认
+                result = repairRecordService.queryRepairOrderList(currentPage, pageCount, userId, dateNow, user.getSchoolId());
+                break;
             default:
                 break;
         }
@@ -1068,9 +1071,11 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                     } else if (r.getMaintenanceState() == 4) {
                         r.setState("待支付");
                         r.setDelayed(1);
+                        r.setClose(1);
                     } else if (r.getMaintenanceState() == 5 || r.getMaintenanceState() == 6) {
                         r.setState(r.getMaintenanceState() == 5 ? "转单待审核" : "协作待审核");
                         r.setDelayed(1);
+                        r.setClose(1);
                     } else if (r.getMaintenanceState() == 7) {
                         r.setState("已完成");
                     } else if (r.getMaintenanceState() == 8) {
@@ -1116,6 +1121,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState(r.getMaintenanceState() == 5 ? "转单待审核" : (r.getMaintenanceState() == 6 ? "协作待审核" : "转线下待审核"));
                     r.setDelayed(1);
+                    r.setClose(1);
                 }
                 break;
             case 5:
@@ -1180,6 +1186,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 result = repairRecordService.queryNotTimeout(currentPage, pageCount, stateStr, keyWord, startTime, endTime, schoolId, maintenanceName);
                 for (RepairRecordPageVo r : result.getList()) {
                     r.setState("待支付");
+                    r.setClose(1);
                 }
             default:
                 break;
@@ -1250,7 +1257,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 List<RepairLeaveMessage> alls = messages.stream().filter(e -> e.getRecordId() == r.getId()).collect(Collectors.toList());
                 List<RepairLeaveMessage> owns = alls.stream().filter(e -> e.getRecordId() == r.getId() && e.getSenderId().equals(r.getUserId())).collect(Collectors.toList());
                 r.setReply(owns.size() > alls.size() / 2 ? 1 : 0);
-                r.setAreaName(r.getAreaName()+":"+r.getAddressName());
+                r.setAreaName(r.getAreaName()+r.getAddressName());
             }
 
         }
@@ -2391,11 +2398,15 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 
         List<TrackDetailsVo> tracks = repairTrackRecordService.queryDetailData(recordId);
         List<RepairConsumables> rcs = repairConsumablesService.getRepairsByRecordId(recordId);
+        RepairPayRecord repairPayRecord=repairPayRecordService.getRepairPayByRecordId(recordId);
         if (tracks.size() > 0) {
             rr.setTracks(tracks);
         }
         if (rcs.size() > 0) {
             rr.setConsumables(rcs);
+            if(repairPayRecord!=null){
+                rr.setPayTime(repairPayRecord.getCreateTime());
+            }
         }
 
         return CommonResult.ok(rr);
@@ -4237,8 +4248,28 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail("订单不存在，关单失败！");
         }
 
-        //待接单才能关单
-        if (recordData.getMaintenanceState() != eRecordStatu.Dispatch.getValue()) {
+        RepairUser repairUser=repairUserService.getRepairById(Integer.parseInt(userId));
+
+        //郭师傅和后勤不限状态都能关单
+        if(repairUser!=null&&(repairUser.getUserZzid()==2||repairUser.getUserZzid()==3)){
+            //已关闭
+            if (recordData.getMaintenanceState() == eRecordStatu.Closed.getValue()) {
+                return CommonResult.fail("工单已关闭");
+            }
+            //已取消
+            if (recordData.getMaintenanceState() == eRecordStatu.Canceled.getValue()) {
+                return CommonResult.fail("工单已取消");
+            }
+            //已完成
+            if (recordData.getMaintenanceState() == eRecordStatu.Finished.getValue()) {
+                return CommonResult.fail("工单已完成");
+            }
+            //已转线下
+            if (recordData.getMaintenanceState() == eRecordStatu.Offline.getValue()) {
+                return CommonResult.fail("工单已转线下");
+            }
+        }else if (recordData.getMaintenanceState() != eRecordStatu.Dispatch.getValue()) {
+            //待接单才能关单--维修师傅
             return CommonResult.fail("待接单状态的工单才能关闭");
         }
 
@@ -4318,10 +4349,23 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             return CommonResult.fail("订单不存在，关单失败！");
         }
 
-        //待接单才能关单
-        if (recordData.getMaintenanceState() != eRecordStatu.Dispatch.getValue()) {
-            return CommonResult.fail("待接单状态的工单才能关闭");
+        //已关闭
+        if (recordData.getMaintenanceState() == eRecordStatu.Closed.getValue()) {
+            return CommonResult.fail("工单已关闭");
         }
+        //已取消
+        if (recordData.getMaintenanceState() == eRecordStatu.Canceled.getValue()) {
+            return CommonResult.fail("工单已取消");
+        }
+        //已完成
+        if (recordData.getMaintenanceState() == eRecordStatu.Finished.getValue()) {
+            return CommonResult.fail("工单已完成");
+        }
+        //已转线下
+        if (recordData.getMaintenanceState() == eRecordStatu.Offline.getValue()) {
+            return CommonResult.fail("工单已转线下");
+        }
+
 
         String userID = AesUtils.decrypt(userhead);
         RepairAdmin operateData = repairAdminService.getRepairById(userID);
@@ -4876,6 +4920,9 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             case 8:
                 result = repairRecordService.queryTeamWorkOffline(currentPage, pageCount, schoolId);
                 break;
+            case 9:
+                result = repairRecordService.queryTeamWorkPay(currentPage, pageCount, schoolId);
+                break;
             default:
                 break;
         }
@@ -4900,5 +4947,64 @@ public class RepairRecordController implements RepairRecordControllerAPI {
 //    public CommonResult queryTeamWorkPage(int currentPage, int pageCount, int state, int schoolId) {
 //        return CommonResult.ok("");
 //    }
+
+    /**
+     * 管理端关单操作
+     *
+     * @param recordIds 维修记录ID
+     * @param userhead 请求头
+     * @param reason   关单原因
+     * @return
+     * @throws Exception
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult closePCOrderBeath(String recordIds, String userhead, String reason, String remark) throws Exception {
+
+        List<String> listIds = Arrays.asList(recordIds.split(","));
+        //获取订单
+        Collection<RepairRecord> recordDataS =  repairRecordService.listByIds(listIds);
+        if (recordDataS == null||recordDataS.size()<1) {
+            return CommonResult.fail("订单均不存在，关单失败！");
+        }
+        String userID = AesUtils.decrypt(userhead);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        if (operateData == null) {
+            return CommonResult.fail("操作人信息不合法，无法进行关单！");
+        }
+        recordDataS=recordDataS.stream().filter(e->e.getMaintenanceState()<7||e.getMaintenanceState()==11).collect(Collectors.toList());
+
+        try {
+            Collection<RepairTrackRecord> trackRecordS=new ArrayList<RepairTrackRecord>();
+            for(RepairRecord record:recordDataS){
+                //将工单状态更新为维修中
+                record.setCustomsOfficerId(userID.toString());
+                record.setRemark(reason);
+                record.setMaintenanceState(eRecordStatu.Closed.getValue());
+                RepairTrackRecord rtr = new RepairTrackRecord();
+                //插入工单记录表
+                rtr.setRecordId(record.getId());
+                rtr.setMaintenanceState(eRecordStatu.Closed.getValue());
+                rtr.setContent("已关单-" + reason + "  补充说明：" + remark+" 批量关单");
+                rtr.setUserId(0);
+                rtr.setUserZzstr("维修师傅");
+                trackRecordS.add(rtr);
+            }
+            boolean updateRecord = repairRecordService.updateBatchById(recordDataS);
+            if (!updateRecord) {
+                return CommonResult.fail("关单失败！");
+            }
+            boolean insertRtr = repairTrackRecordService.saveBatch(trackRecordS);
+            if (!insertRtr) {
+                throw new Exception("关单失败");
+            }
+
+        } catch (Exception e) {
+            throw new Exception("关单失败！");
+        }
+
+        return CommonResult.ok("关单成功");
+    }
+
 }
 

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

@@ -375,12 +375,13 @@ public class RepairUserController implements RepairUserControllerAPI {
         //判断是否存在待接单或维修中数据:
         //接单表中是否存在当前用户ID的数据条数
         //维修表中是否存在当前用户ID的数据条数
-        DisReceCountVo disCount = repairDispatchRecordService.queryDisReceCount(Integer.valueOf(id));
-        if (disCount != null) {
-            if (disCount.getDisCount() > 0 || disCount.getRecCount() > 0) {
-                return CommonResult.fail("存在待处理工单，无法删除");
-            }
-        }
+        //2024年9月24日取消删除限制
+//        DisReceCountVo disCount = repairDispatchRecordService.queryDisReceCount(Integer.valueOf(id));
+//        if (disCount != null) {
+//            if (disCount.getDisCount() > 0 || disCount.getRecCount() > 0) {
+//                return CommonResult.fail("存在待处理工单，无法删除");
+//            }
+//        }
 
         try {
             //删除维修关联楼栋数据

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

@@ -21,7 +21,7 @@ import java.util.List;
  */
 @Repository
 public interface RepairConsumablesMapper extends BaseMapper<RepairConsumables> {
-    IPage<ConsumablePageVo> queryConsumablePageList(IPage<ConsumablePageVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<ConsumablePageVo> queryConsumablePageList(IPage<ConsumablePageVo> page, @Param("keyWord") String keyWord,@Param("schoolId") String schoolId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<ConsumableExcelVo> queryConsumableExcelList(@Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
 

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

@@ -23,7 +23,7 @@ import java.util.List;
 public interface RepairConsumeMapper extends BaseMapper<RepairConsume> {
     List<ConsumeVo> queryConsumeList(@Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    IPage<RepairConsumeVo> queryConsumePageList(IPage<RepairConsumeVo> page, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<RepairConsumeVo> queryConsumePageList(IPage<RepairConsumeVo> page, @Param("schoolId") String schoolId, @Param("name") String name, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<RepairArticleConsumeVo> queryArticleConsumes(@Param("schoolId") Integer schoolId, @Param("keyWork") String keyWork, @Param("findInSet") String findInSet);
 

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

@@ -22,7 +22,7 @@ import java.util.List;
 public interface RepairEvaluateMapper extends BaseMapper<RepairEvaluate> {
     List<EvaluateVo> queryEvaluatePageList(@Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    IPage<EvaluateVo> queryEvaluatePageList(IPage<EvaluateVo> page, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<EvaluateVo> queryEvaluatePageList(IPage<EvaluateVo> page, @Param("star") String star, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<RecordEvaluateVo> queryEvaluateList(@Param("dateStr") String dateStr);
 }

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

@@ -2,6 +2,7 @@ package com.repair.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.repair.model.pojo.RepairRecord;
 import com.repair.model.vo.*;
 import org.apache.ibatis.annotations.Param;
@@ -59,6 +60,8 @@ public interface RepairRecordMapper extends BaseMapper<RepairRecord> {
 
     IPage<RepairTechnicianVo> queryTeamWorkOffline(IPage<RepairTechnicianVo> page,@Param("schoolId") Integer schoolId);
 
+    IPage<RepairTechnicianVo> queryTeamWorkPay(Page<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/vo/DetailsVo.java

@@ -143,4 +143,9 @@ public class DetailsVo {
      * 耗材详情集合
      */
     private List<RepairConsumables> consumables;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
 }

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

@@ -21,6 +21,11 @@ public class MaintenanceTechnicianVo {
     private int maintenanceCount;
 
     /**
+     * 待支付
+     */
+//    private int stayPayCount;
+
+    /**
      * 已超时
      */
    // private int timeoutCount;//待取消

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

@@ -50,4 +50,9 @@ public class TeamWorkCountVo {
      * 转线下
      */
     private int offlineCount;
+
+    /**
+     * 转线下
+     */
+    private int stayPayCount;
 }

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

@@ -34,7 +34,7 @@ public interface RepairConsumablesService extends IService<RepairConsumables> {
 
     List<RepairConsumables> getRepairsByRecordId(Integer recordIds);
 
-    PageUtils<ConsumablePageVo> queryConsumablePageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime);
+    PageUtils<ConsumablePageVo> queryConsumablePageList(int currentPage, int pageCount,String schoolId, String keyWord, String startTime, String endTime);
 
     List<ConsumableExcelVo> queryConsumablePageList(String keyWord, String startTime, String endTime);
 

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

@@ -22,7 +22,7 @@ public interface RepairConsumeService extends IService<RepairConsume> {
 
     int updateRepairConsume(RepairConsume rns);
 
-    PageUtils<RepairConsumeVo> queryPageRepairConsumes(int currentPage, int pageCount, String name, String startTime, String endTime);
+    PageUtils<RepairConsumeVo> queryPageRepairConsumes(int currentPage, int pageCount, String schoolId, String name, String startTime, String endTime);
 
     int deleteRepairConsumeById(int id);
 

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

@@ -21,7 +21,7 @@ public interface RepairEvaluateService extends IService<RepairEvaluate> {
 
     int deleteRepairEvaluateById(int id);
 
-    PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime);
+    PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount, String star,String keyWord, String startTime, String endTime);
 
     RepairEvaluate getRepairById(int id);
 

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

@@ -69,6 +69,8 @@ public interface RepairRecordService extends IService<RepairRecord> {
 
     PageUtils<RepairTechnicianVo> queryTeamWorkOffline(int currentPage, int pageCount, Integer schoolId);
 
+    PageUtils<RepairTechnicianVo> queryTeamWorkPay(int currentPage, int pageCount, Integer schoolId);
+
     List<ReportExportVo> queryNotTimeoutReportExport(String stateStr, String keyWord, String startTime, String endTime, Integer schoolId);
 
     RepairRecord queryRepairByRecordno(String recordNo);

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

@@ -86,11 +86,11 @@ public class RepairConsumablesServiceImpl extends ServiceImpl<RepairConsumablesM
     }
 
     @Override
-    public PageUtils<ConsumablePageVo> queryConsumablePageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
+    public PageUtils<ConsumablePageVo> queryConsumablePageList(int currentPage, int pageCount,String schoolId, String keyWord, String startTime, String endTime) {
         Page<ConsumablePageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<ConsumablePageVo> datas = repairConsumablesMapper.queryConsumablePageList(page, keyWord, startTime, endTime);
+        IPage<ConsumablePageVo> datas = repairConsumablesMapper.queryConsumablePageList(page, keyWord,schoolId, startTime, endTime);
         return new PageUtils(datas);
     }
 

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

@@ -43,11 +43,11 @@ public class RepairConsumeServiceImpl extends ServiceImpl<RepairConsumeMapper, R
     }
 
     @Override
-    public PageUtils<RepairConsumeVo> queryPageRepairConsumes(int currentPage, int pageCount, String name, String startTime, String endTime) {
+    public PageUtils<RepairConsumeVo> queryPageRepairConsumes(int currentPage, int pageCount, String schoolId, String name, String startTime, String endTime) {
         Page<RepairConsumeVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<RepairConsumeVo> datas = repairConsumeMapper.queryConsumePageList(page, name, startTime, endTime);
+        IPage<RepairConsumeVo> datas = repairConsumeMapper.queryConsumePageList(page,schoolId, name, startTime, endTime);
         return new PageUtils(datas);
     }
 

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

@@ -43,7 +43,7 @@ public class RepairEvaluateServiceImpl extends ServiceImpl<RepairEvaluateMapper,
     }
 
     @Override
-    public PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount, String keyWord, String startTime, String endTime) {
+    public PageUtils<RepairEvaluate> queryPageList(int currentPage, int pageCount,String star, String keyWord, String startTime, String endTime) {
         Page<EvaluateVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
@@ -53,7 +53,7 @@ public class RepairEvaluateServiceImpl extends ServiceImpl<RepairEvaluateMapper,
         }catch (Exception e){
 
         }
-        IPage<EvaluateVo> result = repairEvaluateMapper.queryEvaluatePageList(page, keyWord, startTime, endTime);
+        IPage<EvaluateVo> result = repairEvaluateMapper.queryEvaluatePageList(page,star, keyWord, startTime, endTime);
         return new PageUtils(result);
     }
 

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

@@ -244,6 +244,15 @@ public class RepairRecordServiceImpl extends ServiceImpl<RepairRecordMapper, Rep
     }
 
     @Override
+    public PageUtils<RepairTechnicianVo> queryTeamWorkPay(int currentPage, int pageCount, Integer schoolId) {
+        Page<RepairTechnicianVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<RepairTechnicianVo> result = repairRecordMapper.queryTeamWorkPay(page, schoolId);
+        return new PageUtils(result);
+    }
+
+    @Override
     public RepairRecord queryRepairByRecordno(String recordNo) {
         QueryWrapper<RepairRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_no", recordNo);

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

@@ -82,7 +82,8 @@ public class RepairShiftSettingsServiceImpl extends ServiceImpl<RepairShiftSetti
     public List<RepairShiftSettings> getRepairsByShiftIds(List<String> shiftIds, String dateNow) {
         QueryWrapper<RepairShiftSettings> queryWrapper = new QueryWrapper();
         queryWrapper.in("id", shiftIds);
-        queryWrapper.gt("end_time", dateNow);
+        //取消下班时间限制
+//        queryWrapper.gt("end_time", dateNow);
         queryWrapper.orderByDesc("end_time");
         List<RepairShiftSettings> result = repairShiftSettingsMapper.selectList(queryWrapper);
         return result;

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ spring:
   datasource:
     username: root
     password: Chuanghai_2023.
-    url: jdbc:mysql://172.16.20.95:3306/repair_report?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.16.20.95:3306/repair_test?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     cache:
       type: redis

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

@@ -27,6 +27,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and rcs.update_time BETWEEN #{startTime} and #{endTime}
             </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rr.school_id =#{schoolId}
+            </if>
         </where>
         order by rr.report_time desc,rcs.update_time desc
     </select>

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

@@ -47,6 +47,9 @@
             <if test="name != null and name != ''">
                 and rc.name like '%' #{name} '%'
             </if>
+            <if test="schoolId != null and schoolId != ''">
+                and rc.school_id = #{schoolId}
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and rc.update_time BETWEEN #{startTime} and #{endTime}
             </if>

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

@@ -29,6 +29,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and re.create_time BETWEEN #{startTime} and #{endTime}
             </if>
+            <if test="star != null and star != ''">
+                and re.star = #{star}
+            </if>
         </where>
         order by re.create_time desc
     </select>

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

@@ -67,7 +67,7 @@
             or rpr.record_id in (select id from repair_record where deleted = 0 and record_no like '%' #{keyWord} '%')
             or rpr.record_id in (select id from repair_record where deleted = 0 and area_id like '%' #{keyWord} '%')
             or rpr.record_id in (select id from repair_record where deleted =0 and address like '%' #{keyWord} '%')
-            or rpr.record_id in (select id from repair_record where deleted =0 and concat(area_id,address)like concat('%',#{keyWord),'%'))
+            or rpr.record_id in (select id from repair_record where deleted =0 and concat(area_id,address)like concat('%' #{keyWord} '%')))
         </if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and rpr.create_time between #{startTime} and #{endTime}

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

@@ -647,6 +647,7 @@
        <!-- <result property="timeoutCount" column="timeout_count"/>-->
         <result property="closedCount" column="closed_count"/>
         <result property="offlineCount" column="offline_count"/>
+        <result property="stayPayCount" column="stayPayCount"/>
     </resultMap>
 
     <select id="queryTeamWorkCount" resultType="com.repair.model.vo.TeamWorkCountVo" resultMap="teamWorkOrderMap">
@@ -680,6 +681,8 @@
         where rr7.deleted = 0 and rr7.school_id = #{schoolId} and rr7.maintenance_state = 7) as finished_count,
         (select Count(*) from repair_record rr9
         where rr9.deleted = 0 and rr9.school_id = #{schoolId} and rr9.maintenance_state = 3) as logistics_count,
+        (select Count(*) from repair_record rr9
+         where rr9.deleted = 0 and rr9.school_id = #{schoolId} and rr9.maintenance_state = 4) as stayPayCount,
         (SELECT count(*) as cs FROM (
         select rdr.users_id as user_id,rr.maintenance_state,rr.article_id,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rr.description,rr.image,rr.maintenancer_name,rr.maintenancer_phone,rr.price  from repair_record rr
         inner join repair_dispatch_record rdr on rdr.deleted = 0 and rdr.record_id = rr.id and rdr.is_lose_efficacy = 0
@@ -763,6 +766,16 @@
         order by rr.report_time DESC
     </select>
 
+    <!--待处理/待支付-->
+    <select id="queryTeamWorkPay" resultType="com.repair.model.vo.RepairTechnicianVo"
+            resultMap="repairRecordTechnicianDataMap">
+        select rr.voice,rr.voice_length,rr.finish_voice,rr.finish_voice_length,rr.id,rr.record_no,rr.report_time,rr.user_name,rr.user_phone,rr.area_id as area_name,rr.address,rat.name as article_name ,rr.description,rr.image,'待支付' as state,rr.maintenancer_name,rr.maintenancer_phone,rr.price,rr.user_class
+        from repair_record rr
+                 left join repair_article_type rat on rat.deleted = 0 and rat.id = rr.article_id
+        where rr.deleted = 0 and rr.school_id = #{schoolId} and rr.maintenance_state = 4
+        order by rr.report_time DESC
+    </select>
+
     <!--已超时-->
     <select id="queryTeamWorkTimeout" resultType="com.repair.model.vo.RepairTechnicianVo"
             resultMap="repairRecordTechnicianDataMap">