推书推送srm消息显示

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrder.java

@@ -396,6 +396,11 @@ public class SyShippingOrder {
 	@ApiModelProperty(value = "二维表格")
 	private List<SizeTable> sizeTables;
 
+	/** 推送srm 消息 **/
+	@TableField(exist = false)
+	private String pushSrmState;
+	@TableField(exist = false)
+	private String pushSrmMessage;
 //	public List<SizeTable>  sizeTablesList(){
 //		List<SizeTable>  sizes=new ArrayList<>();
 //		List<String> arrays=new ArrayList<>();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -40,6 +40,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.ZonedDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 托书主表实体类
@@ -79,6 +80,19 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
     @Override
     public IPage<SyShippingOrder> syShippingOrderPageList(IPage<SyShippingOrder> page, QueryWrapper<SyShippingOrder> queryWrapper,String type) {
         IPage<SyShippingOrder> page1=syShippingOrderMapper.syShippingOrderPageList(page, queryWrapper,type);
+        List<SyShippingOrder> syShippingOrderList = page1.getRecords();
+        if (oConvertUtils.listIsNotEmpty(syShippingOrderList)){
+            QueryWrapper<SyShippingOrderItem> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.lambda().in(SyShippingOrderItem::getSyShippingOrderItemId,syShippingOrderList.stream().map(SyShippingOrder::getId).collect(Collectors.toList()));
+            List<SyShippingOrderItem> orderItemList = syShippingOrderItemService.list(queryWrapper1);
+            for (SyShippingOrder syShippingOrder : syShippingOrderList){
+                SyShippingOrderItem findItem = orderItemList.stream().filter(item -> item.getSyShippingOrderItemId().equals(syShippingOrder.getId())).findFirst().orElse(null);
+                if (findItem != null){
+                    syShippingOrder.setPushSrmState(findItem.getPushSrmState());
+                    syShippingOrder.setPushSrmMessage(findItem.getPushSrmMessage());
+                }
+            }
+        }
 //        page1.setTotal();
         return page1;
     }
@@ -483,6 +497,12 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         List<SyShippingOrder> entityList = this.list(queryWrapper);
 
         if(entityList.size()!=0 && type.equals("1")){
+            // 设置srm状态为未推送
+            UpdateWrapper<SyShippingOrderItem> itemUpdateWrapper = new UpdateWrapper<>();
+            itemUpdateWrapper.set("push_srm_state","0");
+            itemUpdateWrapper.in("sy_shipping_order_item_id", entityList.stream().map(SyShippingOrder::getId).collect(Collectors.toList()));
+            syShippingOrderItemService.update(itemUpdateWrapper);
+
             for(SyShippingOrder li:entityList){
                 li.setTheDocumentsState("1");
                 updateById(li);