运输服务mongodb字段格式修改

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

@@ -74,14 +74,14 @@ public class KwTransportController {
      * @return
      */
     @RequestMapping(value = "/export", method = RequestMethod.GET)
-    public HttpResult export(ConsignOrderQuery query) {
+    public HttpResult export(@Validated @RequestBody ConsignOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
         List<ConsignOrderVo> list = transportService.export(query);
         if (!org.springframework.util.CollectionUtils.isEmpty(list)) {
             ExcelUtil.download(response, ConsignOrderVo.class, list);
             return null;
         }
-        return HttpResult.error("没有可导出的数据");
+        return HttpResult.ok("没有可导出的数据");
     }
 
 }

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

@@ -70,19 +70,26 @@ public class KwTransportService {
         Criteria c3 = new Criteria();
         Criteria c4 = new Criteria();
         Criteria c5 = new Criteria();
-        Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
-        c1 = Criteria.where("firmName").regex(pattern);
-        c2 = Criteria.where("carrierFirmName").regex(pattern);
-        c3 = Criteria.where("checkFirmName").regex(pattern);
-        c4 = Criteria.where("tOrderNo").regex(pattern);
-        c5 = Criteria.where("lOrderNo").regex(pattern);
-        criteria.orOperator(c1, c2, c3, c4, c5);
+        if (StringUtils.isNotBlank(query.getKeywords())) {
+            Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+            c1 = Criteria.where("firmName").regex(pattern);
+            c2 = Criteria.where("carrierFirmName").regex(pattern);
+            c3 = Criteria.where("checkFirmName").regex(pattern);
+            c4 = Criteria.where("tOrderNo").regex(pattern);
+            c5 = Criteria.where("lOrderNo").regex(pattern);
+            criteria.orOperator(c1, c2, c3, c4, c5);
+        }
+
         Query query1 = new Query(criteria);
+        //in查询
+        if (CollectionUtils.isNotEmpty(query.getIds())) {
+            query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
+        }
         // 12. 总记录数
         long total = mongoTemplate.count(query1, SckwLogisticsOrder.class);
         // 10. 分页
         query1.with(PageRequest.of(query.getPage() - 1, query.getPageSize(),
-                // 11. 排序
+                // 11. 排序list = {ArrayList@27436}  size = 3returnList = {ArrayList@27393}  size = 3
                 Sort.by(Sort.Order.desc("createTime"))));
         // 执行查询
         List<SckwLogisticsOrder> list = mongoTemplate.find(query1, SckwLogisticsOrder.class);
@@ -116,28 +123,24 @@ public class KwTransportService {
             criteria.andOperator(Criteria.where("createTime").gte(param.getStartDateTime()), Criteria.where("createTime")
                     .lte(param.getEndDateTime()));
         }
+        if (CollectionUtils.isNotEmpty(param.getIds())) {
+            criteria = Criteria.where("lOrderId").in(param.getIds());
+        }
         //多条件模糊查询
         Criteria c1 = new Criteria();
         Criteria c2 = new Criteria();
         Criteria c3 = new Criteria();
         Criteria c4 = new Criteria();
         Criteria c5 = new Criteria();
-        Pattern pattern = Pattern.compile("^.*" + param.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
-        c1 = Criteria.where("firmName").regex(pattern);
-        c2 = Criteria.where("carrierFirmName").regex(pattern);
-        c3 = Criteria.where("checkFirmName").regex(pattern);
-        c4 = Criteria.where("tOrderNo").regex(pattern);
-        c5 = Criteria.where("lOrderNo").regex(pattern);
-        criteria.orOperator(c1, c2, c3, c4, c5);
-//        if (StringUtils.isNotBlank(param.getKeywords() )) {
-//            criteria.and("firmName").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("carrierFirmName").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("checkFirmName").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("tOrderNo").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("tOrderNo").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//            criteria.and("lOrderNo").regex(Pattern.compile("^.*" + param.getKeywords()  + ".*$", Pattern.CASE_INSENSITIVE));
-//
-//        }
+        if (StringUtils.isNotBlank(param.getKeywords())) {
+            Pattern pattern = Pattern.compile("^.*" + param.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+            c1 = Criteria.where("firmName").regex(pattern);
+            c2 = Criteria.where("carrierFirmName").regex(pattern);
+            c3 = Criteria.where("checkFirmName").regex(pattern);
+            c4 = Criteria.where("tOrderNo").regex(pattern);
+            c5 = Criteria.where("lOrderNo").regex(pattern);
+            criteria.orOperator(c1, c2, c3, c4, c5);
+        }
         Aggregation aggregation = Aggregation.newAggregation(
                 Aggregation.match(criteria),
                 Aggregation.group("status").count().as("total"),
@@ -177,20 +180,19 @@ public class KwTransportService {
         Criteria c3 = new Criteria();
         Criteria c4 = new Criteria();
         Criteria c5 = new Criteria();
-        Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
-        c1 = Criteria.where("firmName").regex(pattern);
-        c2 = Criteria.where("carrierFirmName").regex(pattern);
-        c3 = Criteria.where("checkFirmName").regex(pattern);
-        c4 = Criteria.where("tOrderNo").regex(pattern);
-        c5 = Criteria.where("lOrderNo").regex(pattern);
-        criteria.orOperator(c1, c2, c3, c4, c5);
+        if (StringUtils.isNotBlank(query.getKeywords())) {
+            Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+            c1 = Criteria.where("firmName").regex(pattern);
+            c2 = Criteria.where("carrierFirmName").regex(pattern);
+            c3 = Criteria.where("checkFirmName").regex(pattern);
+            c4 = Criteria.where("tOrderNo").regex(pattern);
+            c5 = Criteria.where("lOrderNo").regex(pattern);
+            criteria.orOperator(c1, c2, c3, c4, c5);
+        }
         Query query1 = new Query(criteria);
-        // 12. 总记录数
-        long total = mongoTemplate.count(query1, SckwLogisticsOrder.class);
-        // 10. 分页
-        query1.with(PageRequest.of(query.getPage() - 1, query.getPageSize(),
-                // 11. 排序
-                Sort.by(Sort.Order.desc("createTime"))));
+        if (CollectionUtils.isNotEmpty(query.getIds())) {
+            query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
+        }
         // 执行查询
         List<SckwLogisticsOrder> list = mongoTemplate.find(query1, SckwLogisticsOrder.class);
 //        PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, list);
@@ -240,6 +242,10 @@ public class KwTransportService {
             vo.setStatus(logisticsOrder.getStatus());
             vo.setUnloadAddress(logisticsOrder.getUnloadDetailAddress());
             vo.setWOrderNo(logisticsOrder.getWOrderNo());
+            vo.setCreateTime(logisticsOrder.getCreateTime() == null ?
+                    null : DateUtil.getDateTime(logisticsOrder.getCreateTime()));
+            vo.setUpdateTime(logisticsOrder.getUpdateTime() == null ?
+                    null : DateUtil.getDateTime(logisticsOrder.getUpdateTime()));
             returnList.add(vo);
         }
     }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/ConsignOrderQuery.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author lfdc
@@ -14,6 +15,7 @@ import java.io.Serializable;
 @Data
 @Accessors(chain = true)
 public class ConsignOrderQuery extends PageRequest implements Serializable {
+    private List<Long> ids;
     /**
      * 计费方式
      */

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/ConsignOrderVo.java

@@ -1,6 +1,8 @@
 package com.sckw.report.service.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.sckw.core.model.page.PageResult;
+import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,30 +13,37 @@ import java.io.Serializable;
  * @date 2023-07-07 09:07:06
  */
 @Data
+@ExcelContext(fileName = "托运订单列表", sheetName = "托运订单列表")
 public class ConsignOrderVo extends PageResult implements Serializable {
     /**
      * 结算周期
      */
+    @ExcelProperty(value = "结算周期")
     private String accountsCycle;
     /**
      * 发起人
      */
+    @ExcelProperty(value = "发起人")
     private String appointor;
     /**
      * 计费方式
      */
+    @ExcelProperty(value = "计费方式")
     private String billingMode;
     /**
      * 承运单位
      */
+    @ExcelProperty(value = "承运单位")
     private String carrierCompany;
     /**
      * 承运联系人
      */
+    @ExcelProperty(value = "承运联系人")
     private String carrierContacts;
     /**
      * 承运订单
      */
+    @ExcelProperty(value = "承运订单")
     private String carrierOrder;
     /**
      * 承运联系电话
@@ -136,4 +145,6 @@ public class ConsignOrderVo extends PageResult implements Serializable {
      * 关联承运订单号
      */
     private String wOrderNo;
+    private String createTime;
+    private String updateTime;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -198,7 +198,7 @@ public class LogisticsConsignmentService {
         logisticsOrder.setUpdateByName(LoginUserHolder.getUserName());
         logisticsOrder.setUpdateTime(new Date());
         logisticsOrder.setGoodsPriceUnit(bo.getGoodsPriceUnit());
-        logisticsOrder.setContractName(new Date() + bo.getContractName());
+        logisticsOrder.setContractName(bo.getContractName());
         logisticsOrder.setBillingMode(bo.getBillingMode());
         //rabbitMq业务汇总数据发送/消费对象
         SckwBusSum busSum = new SckwBusSum();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

@@ -1,10 +1,16 @@
 package com.sckw.transport.service.dubbo;
 
+import com.sckw.transport.api.dubbo.TransportDubboService;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.stereotype.Service;
+
 /**
  * @author lfdc
  * @description 运输服务dubbo接口
  * @date 2023-07-11 14:07:28
  */
-public class TransportDubboServiceImpl implements TransportDubboService{
+@Service
+@DubboService(group = "design", version = "2.0.0")
+public class TransportDubboServiceImpl implements TransportDubboService {
 
 }