1.5部分的bug

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -119,7 +119,7 @@ public class WorkOrderBaseController extends BaseController {
     public AjaxResult getList(WorkOrderBase input, PageInput pageInput, int listType) {
         LambdaQueryWrapper<WorkOrderBase> qw = new LambdaQueryWrapper<>();
 
-        qw.eq(input.getFirsttype()!=null && input.getFirsttype()>0,WorkOrderBase::getFirsttype, input.getFirsttype());
+        qw.eq(input.getFirsttype() != null && input.getFirsttype() > 0, WorkOrderBase::getFirsttype, input.getFirsttype());
         qw.like(!StringHelper.isEmpty(input.getCallnum()), WorkOrderBase::getCallnum, input.getCallnum());
         qw.like(!StringHelper.isEmpty(input.getCaller()), WorkOrderBase::getCaller, input.getCaller());
 
@@ -128,7 +128,9 @@ public class WorkOrderBaseController extends BaseController {
         qw.eq(input.getArea() != null && input.getArea() > 0, WorkOrderBase::getArea, input.getArea());
         qw.eq(input.getRestartsnum() != null && input.getRestartsnum() >= 0, WorkOrderBase::getRestartsnum, input.getRestartsnum());
         qw.eq(input.getProject() != null && input.getProject() > 0, WorkOrderBase::getProject, input.getProject());
-        qw.eq(input.getWorkordercate() != null && input.getWorkordercate() > 0, WorkOrderBase::getWorkordercate, input.getWorkordercate());
+        // qw.eq(input.getWorkordercate() != null && input.getWorkordercate() > 0, WorkOrderBase::getWorkordercate, input.getWorkordercate());
+
+
         qw.eq(input.getWorkorderstate() != null && input.getWorkorderstate() >= 0, WorkOrderBase::getWorkorderstate, input.getWorkorderstate());
         qw.like(!StringHelper.isEmpty(input.getDealuser()), WorkOrderBase::getDealuser, input.getDealuser());
         qw.like(!StringHelper.isEmpty(input.getSource()), WorkOrderBase::getSource, input.getSource());
@@ -138,6 +140,26 @@ public class WorkOrderBaseController extends BaseController {
         qw.eq(!StringHelper.isEmpty(input.getCreateuser()), WorkOrderBase::getCreateuser, input.getCreateuser());
         qw.eq(WorkOrderBase::getIsdelete, 0);
 
+
+         if(input.getWorkordercate() != null && input.getWorkordercate() > 0) {
+//           List<Long> cateids=  workrodertypeService.selectids(input.getWorkordercate());
+//           qw.in(WorkOrderBase::getWorkordercate,cateids);
+
+          //   qw.like(WorkOrderBase::getWorkordercate,)
+             qw.apply("ancestor LIKE CONCAT('%,', {0}, ',%')", input.getWorkordercate());
+
+        }
+
+
+
+//        if(input.getWorkordercate() != null && input.getWorkordercate() > 0) {
+//            qw.and(wq-> {
+//                wq.inSql(WorkOrderBase::getWorkordercate,
+//                        "SELECT id FROM workorder_type WHERE ancestors LIKE   '%" + input.getWorkordercate() + "%' OR id = " + input.getWorkordercate()
+//                );
+//            });
+//        }
+
         //ge("age", 18)表示查询年龄大于等于18的记录。
         qw.ge(input.getCreatetime() != null , WorkOrderBase::getCreatetime, input.getCreatetime());
         qw.le(input.getEndtime() != null , WorkOrderBase::getCreatetime, input.getEndtime());
@@ -331,6 +353,9 @@ public class WorkOrderBaseController extends BaseController {
 
         }
 
+       WorkOrderType typemodel=   workrodertypeService.getEntity(  input.getWorkordercate());
+        input.setAncestor(","+typemodel.getAncestors()+","+input.getWorkordercate()+",");
+
         boolean result = workorderbaseService.insert(input);
         if ( input.getCallId() !=null && input.getCallId()>0) {
 
@@ -438,6 +463,13 @@ else {
     public AjaxResult edit(@RequestBody WorkOrderBase input) {
         Date currentDate = new Date(System.currentTimeMillis());
         WorkOrderBase orderBase = workorderbaseService.getEntity(input.getWorkorderId());
+
+        if(!Objects.equals(input.getWorkordercate(), orderBase.getWorkordercate())){
+
+            WorkOrderType typemodel=   workrodertypeService.getEntity(  input.getWorkordercate());
+            input.setAncestor(","+typemodel.getAncestors()+","+input.getWorkordercate()+",");
+        }
+
         //boolean noend = orderBase.getIsend() == 0 ? true : false;
 //        orderBase.setCaller(input.getCaller());
 //        orderBase.setCallnum(input.getCallnum());

hjzx-api/src/main/java/api/controller/report/WorkReportController.java

@@ -190,7 +190,7 @@ public class WorkReportController extends BaseController {
     @ApiOperation("话务简报")
     @Log(title = "话务简报",businessType = BusinessType.QUERY)
     @GetMapping("/selectTelephoneBriefing")
-    public AjaxResult selectTelephoneBriefing(@RequestParam String startTime, @RequestParam  String endTime)  {
+    public AjaxResult selectTelephoneBriefing(@RequestParam(required = false) String startTime, @RequestParam(required = false)  String endTime)  {
         var obj =ReportBaseService.selectTelephoneBriefing(startTime,endTime);
         return Success("成功",obj);
     }
@@ -198,7 +198,7 @@ public class WorkReportController extends BaseController {
     @ApiOperation("导出话务简报")
     @Log(title = "导出话务简报",businessType = BusinessType.EXPORT)
     @PostMapping("/exportExcelTelephoneBriefing")
-    public void exportExcelTelephoneBriefing(@RequestParam String startTime, @RequestParam  String endTime) {
+    public void exportExcelTelephoneBriefing(@RequestParam(required = false) String startTime, @RequestParam(required = false)  String endTime) {
         var obj =ReportBaseService.selectTelephoneBriefing(startTime,endTime);
         ExcelHelper<TelephoneBriefing> excel = new ExcelHelper<>(TelephoneBriefing.class);
         excel.exportExcelTelephoneBriefing(obj);

hjzx-entity/src/main/java/api/entity/database/order/WorkOrderBase.java

@@ -17,6 +17,9 @@ import java.util.List;
 @TableName("wo_workorderbase")
 public class WorkOrderBase {
 
+    @ApiModelProperty("工单类型的父级包括自己")
+    private  String ancestor;
+
     private Long callId;
 
     /** 自增id */

hjzx-mapper/src/main/java/api/mapper/system/WorkOrderTypeMapper.java

@@ -14,4 +14,7 @@ public interface WorkOrderTypeMapper extends BaseMapper<WorkOrderType> {
     public List<WorkOrderTypeView> selectWorkroderType(long id);
 
     public WorkOrderTypeView selectWorkroderTypeById(long id);
+
+    public List<Long> selectids(long id);
+
 }

hjzx-mapper/src/main/resources/mapper/system/WorkoderTypeMapper.xml

@@ -30,5 +30,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectids" resultType="Long">
+        SELECT id FROM `workorder_type` WHERE  ancestors like     concat('%', #{id}, '%')
+
+                                                  or  id=#{id}
+
+
+    </select>
+
+
 
 </mapper> 

hjzx-service/src/main/java/api/service/report/impl/DataAnalysisServiceImpl.java

@@ -3,6 +3,7 @@ package api.service.report.impl;
 import api.entity.view.report.*;
 import api.mapper.report.ReportMapper;
 import api.service.report.IDataAnalysisService;
+import api.util.helper.RateSorter;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -387,6 +388,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
                 MapList.add(obj);
             }
         }
+        RateSorter.sort(MapList);
         return MapList;
     }
     //区域关键词数量

hjzx-service/src/main/java/api/service/report/impl/ReportBaseServiceImpl.java

@@ -4,6 +4,7 @@ package api.service.report.impl;
 import api.entity.view.report.*;
 import api.mapper.report.ReportMapper;
 import api.service.report.IReportBaseService;
+import api.util.helper.RateSorter;
 import api.util.helper.SpringHelper;
 import api.util.helper.StringHelper;
 import lombok.var;

hjzx-service/src/main/java/api/service/system/IWorkOrderTypeService.java

@@ -28,5 +28,8 @@ public interface IWorkOrderTypeService extends IBaseService<WorkOrderType> {
 
     public WorkOrderTypeView selectWorkroderTypeById(long id);
 
+
+    public List<Long> selectids(long id);
+
 }
 

hjzx-service/src/main/java/api/service/system/impl/WorkOrderTypeServiceImpl.java

@@ -36,7 +36,11 @@ public class WorkOrderTypeServiceImpl extends BaseServiceImpl<WorkOrderTypeMappe
     {
         return workroderTypeMapper.selectWorkroderTypeById(id);
     }
+    @Override
+    public List<Long> selectids(long id){
 
+        return workroderTypeMapper.selectids(id);
+    }
     @Override
     public List<TreeSelect> buildMenuTreeSelect(List<WorkOrderType> Type) {
         List<WorkOrderType> menuTrees = buildMenuTree(Type);

hjzx-util/src/main/java/api/util/helper/RateSorter.java

@@ -0,0 +1,27 @@
+package api.util.helper;
+
+import com.alibaba.fastjson2.JSON;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Slf4j
+public class RateSorter {
+
+    public static void sort(List<HashMap<String, Object>> list) {
+        Collections.sort(list, new Comparator<HashMap<String, Object>>() {
+            @Override
+            public int compare(HashMap<String, Object> m1, HashMap<String, Object> m2) {
+                // 提取并转换rate值
+                double rate1 = Double.parseDouble(m1.get("rate").toString().replace("%", ""));
+                double rate2 = Double.parseDouble(m2.get("rate").toString().replace("%", ""));
+                // 降序排列：r2与r1比较
+                return Double.compare(rate2, rate1);
+            }
+        });
+    }
+}