承运托运合同去重

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -251,20 +251,6 @@ public class KwTransportController {
         }
     }
 
-    /**
-     * 承运合同/托运合同-根据合同id获取托运订单列表
-     * @param contractParam 请求参数
-     * @return
-     */
-    @RequestMapping(value = "/getLogisticsOrderContract", method = RequestMethod.POST)
-    public HttpResult getLogisticsOrderContract(@Validated @RequestBody ContractParam contractParam) {
-        try {
-            return transportService.getLogisticsOrderByContractId(contractParam);
-        } catch (Exception e) {
-            log.error("承运合同/托运合同-根据合同id获取托运订单列表 error:{}", e.getMessage(), e);
-            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-        }
-    }
 
     /**
      * 运单管理-运单列表 运单地址查询接口

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

@@ -520,18 +520,18 @@ public class KwTransportService {
         Criteria criteria = new Criteria();
         Long entId = LoginUserHolder.getEntId();
         //判断承运还是托运企业
-        if (unitType.equals(String.valueOf(NumberConstant.ONE))) {
-            //托运
-            criteria.orOperator(
-                    Criteria.where("checkTopEntId").is("177802391955968000"),
-                    Criteria.where("checkEntId").is("177802391955968000"));
-        } else {
-            //承运企业主键ID
-//            criteria.and("carrierTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
-            criteria.orOperator(
-                    Criteria.where("carrierTopEntId").is("177802391955968000"),
-                    Criteria.where("carrierEntId").is("177802391955968000"));
-        }
+//        if (unitType.equals(String.valueOf(NumberConstant.ONE))) {
+//            //托运
+//            criteria.orOperator(
+//                    Criteria.where("checkTopEntId").is("177802391955968000"),
+//                    Criteria.where("checkEntId").is("177802391955968000"));
+//        } else {
+//            //承运企业主键ID
+////            criteria.and("carrierTopEntId").is(entMap.get(LoginUserHolder.getEntId()).getId());
+//            criteria.orOperator(
+//                    Criteria.where("carrierTopEntId").is("177802391955968000"),
+//                    Criteria.where("carrierEntId").is("177802391955968000"));
+//        }
         List<String> stringList = StringUtils.splitStrToList(contractIds, String.class);
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         Query query1 = new Query(criteria);