bug fix

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -428,12 +428,12 @@ public class KwTransportService {
         // 创建条件对象
         Criteria criteria = new Criteria();
         // 1. 全等于
-        criteria.and("entId").is(LoginUserHolder.getEntId());
-        criteria.and("_id").is(lOrderId);
-        criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
+//        criteria.and("entId").is(LoginUserHolder.getEntId());
+//        criteria.and("_id").is(lOrderId);
+//        criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         Query query1 = new Query(criteria);
         //多条件模糊查询
-        Criteria c1 = new Criteria().and("entId").is(LoginUserHolder.getEntId());
+        Criteria c1 = new Criteria().and("carrierEntId").is(LoginUserHolder.getEntId());
         Criteria c2 = new Criteria().and("_id").is(lOrderId);
         Criteria c3 = new Criteria().and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         criteria.orOperator(c1, c2, c3);
@@ -464,16 +464,16 @@ public class KwTransportService {
     public HttpResult getLogisticsOrderByContractId(ContractParam contractParam) {
         HttpResult result = new HttpResult();
         if (String.valueOf(NumberConstant.ONE).equals(contractParam.getContractType())) {
-            result = getLogisticsOrderContract(contractParam);
+            result = getLogisticsOrderContract(contractParam,"1");
         } else if (String.valueOf(NumberConstant.ONE).equals(contractParam.getContractType())) {
-            result = getLogisticsOrderContract(contractParam);
+            result = getLogisticsOrderContract(contractParam,"2");
         } else {
             return HttpResult.error("合同类型错误");
         }
         return result;
     }
 
-    private HttpResult getLogisticsOrderContract(ContractParam contractParam) {
+    private HttpResult getLogisticsOrderContract(ContractParam contractParam,String unitType) {
         String contractIds = contractParam.getContractIds();
         int page = contractParam.getPage();
         int pageSize = contractParam.getPageSize();
@@ -482,6 +482,12 @@ public class KwTransportService {
         //设置模糊查询匹配规则  忽略大小写
         // 创建条件对象
         Criteria criteria = new Criteria();
+        //判断承运还是托运企业
+        if (unitType.equals(NumberConstant.ONE)) {
+            criteria.and("checkEntId").is(LoginUserHolder.getEntId());
+        } else {
+            criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
+        }
         List<String> stringList = StringUtils.splitStrToList(contractIds, String.class);
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         Query query1 = new Query(criteria);
@@ -500,7 +506,7 @@ public class KwTransportService {
         // 12. 总记录数
         long total = mongoTemplate.count(query1, SckwLogisticsOrder.class);
         // 10. 分页
-        query1.with(PageRequest.of(page - 1, pageSize, Sort.by(Sort.Order.desc("createTime"))));
+        query1.with(PageRequest.of(page - 1, pageSize, Sort.by(Sort.Direction.DESC,"contractId","createTime")));
         // 执行查询
         List<SckwLogisticsOrder> list = mongoTemplate.find(query1, SckwLogisticsOrder.class);
         //字典等数据转换