优化

platform-dao/src/main/java/com/platform/dao/dto/merge/LongYanPurchaseOrderMergeDTO.java

@@ -23,7 +23,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderMergeDTO extends BaseDTO implements Serializable {
     private Integer oldOrNew;//1:新厂，2老厂
-    private List<LongYanPurchaseOrderVO> longYanPurchaseOrderVOS;
+    private List<LongYanPurchaseOrderVO> purchaseOrderStr;
     private String createdUserName;
     private String title;
     private Integer status;//1:草稿

platform-service/src/main/java/com/platform/service/merge/impl/LongYanPurchaseOrderMergeServiceImpl.java

@@ -39,7 +39,7 @@ public class LongYanPurchaseOrderMergeServiceImpl extends BaseServiceImpl<LongYa
 
     @Override
     public void modModelByDTO(LongYanPurchaseOrderMergeDTO model) {
-        List<LongYanPurchaseOrderVO> longYanPurchaseOrders = model.getLongYanPurchaseOrderVOS();
+        List<LongYanPurchaseOrderVO> longYanPurchaseOrders = model.getPurchaseOrderStr();
         List<DictVO> dictVOS = DictCache.getChildren("MERGE_PARAM_JUGMENT");
         if (longYanPurchaseOrders==null||longYanPurchaseOrders.size()<2){
             throw new BusinessException("请选择至少两个请购单进行合并！");
@@ -116,9 +116,9 @@ public class LongYanPurchaseOrderMergeServiceImpl extends BaseServiceImpl<LongYa
         WeekendCriteria<LongYanPurchaseOrder,Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andEqualTo(LongYanPurchaseOrder::getMergeId,model.getId());
         longYanPurchaseOrderMapper.updateByExampleSelective(order,weekend);
-        if (model.getLongYanPurchaseOrderVOS()!=null&&model.getLongYanPurchaseOrderVOS().size()>0){
+        if (model.getPurchaseOrderStr()!=null&&model.getPurchaseOrderStr().size()>0){
             order.setMergeId(model.getId());
-            List<String> orderIds = model.getLongYanPurchaseOrderVOS().stream().map(LongYanPurchaseOrderVO::getId).collect(Collectors.toList());
+            List<String> orderIds = model.getPurchaseOrderStr().stream().map(LongYanPurchaseOrderVO::getId).collect(Collectors.toList());
             Weekend<LongYanPurchaseOrder> weekend2 = new Weekend<>(LongYanPurchaseOrder.class);
             WeekendCriteria<LongYanPurchaseOrder,Object> weekendCriteria2 = weekend2.weekendCriteria();
             weekendCriteria2.andIn(LongYanPurchaseOrder::getId,orderIds);