金额判断，取消派单人限制

src/main/java/com/repair/config/MyBatisPlusConfig.java

@@ -44,7 +44,7 @@ public class MyBatisPlusConfig {
     @Profile({"dev","test","prod"})// 设置 dev test 环境开启，保证我们的效率
     public PerformanceInterceptor performanceInterceptor() {
         PerformanceInterceptor performanceInterceptor = new PerformanceInterceptor();
-        performanceInterceptor.setMaxTime(3000); //ms 设置sql执行的最大时间，如果超过了则不执行
+        performanceInterceptor.setMaxTime(30000); //ms 设置sql执行的最大时间，如果超过了则不执行
         performanceInterceptor.setFormat(true);
         return performanceInterceptor;
     }

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

@@ -1250,6 +1250,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());
             }
 
         }
@@ -2954,7 +2955,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
             dataRow1.createCell(5).setCellValue(reportExportVo.getRepairType());
             dataRow1.createCell(6).setCellValue(reportExportVo.getDescription());
             dataRow1.createCell(7).setCellValue(reportExportVo.getArticleName());
-            dataRow1.createCell(8).setCellValue(reportExportVo.getNumber());
+            dataRow1.createCell(8).setCellValue(reportExportVo.getNumber()==null?0:reportExportVo.getNumber());
             dataRow1.createCell(9).setCellValue(reportExportVo.getTotalPrice());
             dataRow1.createCell(10).setCellValue(reportExportVo.getTotalPrice() !=null && Float.parseFloat(reportExportVo.getTotalPrice()) > 0.0  ? "是":"否");
 

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

@@ -231,7 +231,7 @@
         select ru.id,ru.user_name,case team_id when 0 then '校方人员' else '第三方人员' end as team_name,'线下' as userZz_name,wt.name as work_type
         from repair_user ru
         left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
-        where ru.school_id = #{schoolId} and ru.deleted = 0 and ru.user_zzid = 4 and ru.state = 1
+        where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 4 or ru.user_zzid = 1) and ru.state = 1
         <if test="keyWord != null and keyWord != ''">
             and ru.user_name like '%' #{keyWord} '%'
         </if>