时间排序

lichao
1 parent 5ee98a6d
Showing 4 changed files with 43 additions and 11 deletions
trash-garbage/src/main/java/com/trash/garbage/service/GarTransportationEnterpriseService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarTransportationEnterpriseServiceImpl.java
trash-ui/dist.zip
@@ -7,6 +7,9 @@ import java.util.List;
 public interface GarTransportationEnterpriseService {
     String requestStr(String tel,String adCodes,String officeAddress);
-    List<TransportationEnterprise> request(String tel,String adCodes,String officeAddress);
+    // 实现接口中定义的三个参数的request方法
+    List<TransportationEnterprise> request(String tel, String adCodes, String officeAddress);
+
+    List<TransportationEnterprise> request(String tel, String adCodes, String officeAddress, String name);
 }
@@ -770,7 +770,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
         qw.like(StringUtils.isNotEmpty(dto.getGarOrderCompanyName()), GarOrder::getGarOrderCompanyName, dto.getGarOrderCompanyName())
                 .eq(dto.getGarOrderHandlerStatus() != null, GarOrder::getGarOrderHandlerStatus, dto.getGarOrderHandlerStatus())
-                .eq(dto.getGarCancelFlag() != null, GarOrder::getGarCancelFlag, dto.getGarCancelFlag());
+                .eq(dto.getGarCancelFlag() != null, GarOrder::getGarCancelFlag, dto.getGarCancelFlag())
+                .orderByDesc(GarOrder::getGarOrderAgreementTime); // 添加按创建时间倒序排序
         List<GarOrder> list = list(qw);
         PageInfo<GarOrder> pageInfo = new PageInfo<>(list);
         return pageInfo;
@@ -965,10 +966,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return pageInfo;
     }
+
     @Override
     public PageInfo dockingUpEnterpriseList(TransportationEnterprise dto) {
-        // 1）支持选择企业“所属区域”（长沙市内的）展示区域内所有企业
-        // 2）支持选择车辆“车辆类型”展示有该车辆类型的企业
+        // 1）支持选择企业"所属区域"（长沙市内的）展示区域内所有企业
+        // 2）支持选择车辆"车辆类型"展示有该车辆类型的企业
         // TODO 车辆类型暂时不考虑
         Map<String, String> headers = new HashMap<>();
@@ -978,6 +980,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         String tel = null;
         String areaCode = null;
         String officeAddress = null;
+        String name = null; // 添加name变量
         if (StringUtils.isNotEmpty(dto.getServicePhone())) {
             tel = dto.getServicePhone();
@@ -987,6 +990,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             officeAddress = dto.getRegistrationArea();
         }
+        // 添加对企业名称的处理
+        if (StringUtils.isNotEmpty(dto.getName())) {
+            name = dto.getName();
+        }
+
         if (StringUtils.isNotEmpty(dto.getRegistrationArea())) {
             try {
                 JSONArray jsonArray = garAreaServer.request();
@@ -1009,7 +1017,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             }
         }
-        List<TransportationEnterprise> list = garTransportationEnterpriseService.request(tel, areaCode, officeAddress);
+        // 修改这里，将name参数传递给request方法
+        List<TransportationEnterprise> list = garTransportationEnterpriseService.request(tel, areaCode, officeAddress, name);
+
+        // 后续代码保持不变...
         if (CollectionUtils.isNotEmpty(list) && StringUtils.isNotEmpty(tel)) {
             String telStr = tel;
             list = list.stream().filter(t -> StringUtils.equals(telStr, t.getServicePhone())).collect(Collectors.toList());
@@ -1220,7 +1231,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
-        List<TransportationEnterprise> enterprises = garTransportationEnterpriseService.request(tel, null, null);
+        List<TransportationEnterprise> enterprises = garTransportationEnterpriseService.request(tel, null, null, null);
         if (CollectionUtils.isEmpty(enterprises)) {
             return Collections.emptyList();
         }
@@ -11,10 +11,18 @@ import org.springframework.stereotype.Service;
 import java.util.*;
+
 @Service
 public class GarTransportationEnterpriseServiceImpl implements GarTransportationEnterpriseService {
+
+    // 实现接口中定义的三个参数的requestStr方法
     @Override
-    public String requestStr(String tel, String adCodes,String officeAddress) {
+    public String requestStr(String tel, String adCodes, String officeAddress) {
+        return requestStr(tel, adCodes, officeAddress, null); // 调用四个参数的版本，name传null
+    }
+
+    // 新增的四个参数的requestStr方法
+    public String requestStr(String tel, String adCodes, String officeAddress, String name) {
         Map<String, Object> params = new HashMap<>();
         if (StringUtils.isNotEmpty(tel)) {
             params.put("phoneNo", tel);
@@ -24,16 +32,27 @@ public class GarTransportationEnterpriseServiceImpl implements GarTransportation
             params.put("adCodes", adCodes);
         }
-        if (StringUtils.isNotEmpty(adCodes)) {
+        if (StringUtils.isNotEmpty(officeAddress)) {
             params.put("officeAddress", officeAddress);
         }
+        // 添加名称模糊查询参数
+        if (StringUtils.isNotEmpty(name)) {
+            params.put("name", name);
+        }
+
         return HttpUtil.doGet("/api/gpsservice/cs/companies/simple/list?tag=1", params);
     }
+    // 实现接口中定义的三个参数的request方法
     @Override
-    public List<TransportationEnterprise> request(String tel, String adCodes,String officeAddress) {
-        String json = requestStr(tel, adCodes,officeAddress);
+    public List<TransportationEnterprise> request(String tel, String adCodes, String officeAddress) {
+        return request(tel, adCodes, officeAddress, null); // 调用四个参数的版本，name传null
+    }
+
+    // 新增的四个参数的request方法
+    public List<TransportationEnterprise> request(String tel, String adCodes, String officeAddress, String name) {
+        String json = requestStr(tel, adCodes, officeAddress, name); // 传递name参数
         if (StringUtils.isEmpty(json)) {
             return Collections.emptyList();
         }
@@ -47,7 +66,6 @@ public class GarTransportationEnterpriseServiceImpl implements GarTransportation
                         JSONObject jsonObject = (JSONObject) object;
                         TransportationEnterprise transportationEnterprise = new TransportationEnterprise();
                         transportationEnterprise.setId(StringUtils.replace(jsonObject.get("id").toString(), "zxljqy", ""));
-                        //transportationEnterprise.setId(jsonObject.get("id").toString());
                         transportationEnterprise.setName(jsonObject.getString("name"));
                         transportationEnterprise.setAbbreviation(jsonObject.getString("abbreviation"));
                         transportationEnterprise.setOfficeAddress(jsonObject.getString("officeAddress"));