样品单、合同图片多了域名BUG

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -326,6 +326,11 @@ public class Contract extends BasePo {
     private Integer isShow;
 
     /**
+     * 数据JSON
+     */
+    private String dataJson;
+
+    /**
      * 交接单附件列表
      */
     @TableField(exist = false)

hx-sale/src/main/java/com/fjhx/sale/entity/sample/po/Sample.java

@@ -272,6 +272,11 @@ public class Sample extends BasePo {
     private Integer isShow;
 
     /**
+     * 数据JSON
+     */
+    private String dataJson;
+
+    /**
      * 交接单附件列表
      */
     @TableField(exist = false)

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -285,10 +285,10 @@ public class ContractUpdateFlow extends FlowDelegate {
         }
 
         // 交接单附件列表
-        ObsFileUtil.saveAllFile(contract.getFileList(), contract.getId(), 1);
+        ObsFileUtil.copyFileAndSave(contract.getFileList(), contract.getId(), 1);
 
         // 包装指示附件列表
-        ObsFileUtil.saveAllFile(contract.getPackageFileList(), contract.getId(), 2);
+        ObsFileUtil.copyFileAndSave(contract.getPackageFileList(), contract.getId(), 2);
 
         return contract.getId();
     }

hx-sale/src/main/java/com/fjhx/sale/flow/SampleUpdateFlow.java

@@ -261,9 +261,9 @@ public class SampleUpdateFlow extends FlowDelegate {
             sampleShipmentService.saveBatch(sampleShipmentList);
         }
         //交接单附件
-        ObsFileUtil.saveAllFile(sample.getFileList(),sample.getId(),1);
+        ObsFileUtil.copyFileAndSave(sample.getFileList(),sample.getId(),1);
         //包装附件
-        ObsFileUtil.saveAllFile(sample.getPackageFileList(),sample.getId(),2);
+        ObsFileUtil.copyFileAndSave(sample.getPackageFileList(),sample.getId(),2);
         return sample.getId();
     }
 }

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackShipmentServiceImpl.java

@@ -2,12 +2,15 @@ package com.fjhx.sale.service.pack.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.sale.entity.documents.po.Documents;
 import com.fjhx.sale.entity.pack.dto.PackShipmentDto;
 import com.fjhx.sale.entity.pack.dto.PackShipmentSelectDto;
+import com.fjhx.sale.entity.pack.po.Pack;
+import com.fjhx.sale.entity.pack.po.PackDetailGoods;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.fjhx.sale.entity.pack.vo.PackShipmentVo;
 import com.fjhx.sale.mapper.pack.PackShipmentMapper;
@@ -20,9 +23,7 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -104,6 +105,21 @@ public class PackShipmentServiceImpl extends ServiceImpl<PackShipmentMapper, Pac
         String packDetailIds = dto.getPackDetailIds();
         //获取到包装明细单ID列表
         List<String> ids = Arrays.asList(packDetailIds.split(","));
+        //查询自定义货物
+        List<PackDetailGoods> goodsList = packDetailGoodsService.list(Wrappers.<PackDetailGoods>query().lambda().in(PackDetailGoods::getPackDetailId,ids));
+        if(CollectionUtils.isNotEmpty(goodsList)){
+            List<Map<String,Object>> list = new ArrayList<>();
+            for(PackDetailGoods p : goodsList){
+                Map<String,Object> map = new HashMap<>();
+                map.put("businessId",p.getId());
+                map.put("price",0);
+                map.put("quantity",p.getQuantity());
+                map.put("subDescription",p.getRemark());
+                map.put("type","20");
+                list.add(map);
+            }
+            return list;
+        }
         return baseMapper.productDetailList(ids);
     }
 

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -289,6 +289,7 @@
             <if test="id != null and id != '' ">id = #{id},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="isChange != null and isChange != ''">is_change = #{isChange},</if>
+            <if test="isShow != null and isShow != ''">is_show = #{isShow},</if>
             <if test="approvedDate != null">approved_date = DATE_FORMAT(NOW(),'%Y-%m-%d %H:%m:%s'),</if>
             update_time = sysdate()
         </set>

hx-sale/src/main/resources/mapper/sample/SampleMapper.xml

@@ -55,6 +55,7 @@
         <set>
             <if test="id != null and id != '' ">id = #{id},</if>
             <if test="status != null and status != ''">status = #{status},</if>
+            <if test="isShow != null and isShow != ''">is_show = #{isShow},</if>
             <if test="approvedDate != null">approved_date = DATE_FORMAT(NOW(),'%Y-%m-%d %H:%m:%s'),</if>
             update_time = sysdate()
         </set>