Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/CommonBusinessService.java

@@ -17,12 +17,9 @@ import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.ClientTypeEnum;
 import com.sckw.core.model.enums.CooperateTypeEnum;
-import com.sckw.core.utils.AsyncThreadUtils;
-import com.sckw.core.utils.BeanUtils;
+import com.sckw.core.utils.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cloud.stream.function.StreamBridge;
-import com.sckw.core.utils.OkHttpUtils;
-import com.sckw.core.utils.UUIDUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
@@ -265,8 +262,8 @@ public class CommonBusinessService {
      * @author: czh
      * @date: 2023/8/14
      */
-    public void postToEsign(String firstAccount, String secondAccount, Long orgFirst, Long orgSeconId, String contractFile, Long id, String contractName, String filePathPrefix) {
-        AsyncFactory.execute(new AsyncProcess(firstAccount, secondAccount, orgFirst, orgSeconId, contractFile, id, contractName, remoteSystemService, eSignUrl, kwcContractLogisticsMapper, kwcContractTradeMapper, filePathPrefix));
+    public void postToEsign(String firstAccount, String secondAccount, Long orgFirst, Long orgSeconId, String contractFile, Long id, String contractName) {
+        AsyncFactory.execute(new AsyncProcess(firstAccount, secondAccount, orgFirst, orgSeconId, contractFile, id, contractName, remoteSystemService, eSignUrl, kwcContractLogisticsMapper, kwcContractTradeMapper));
     }
 
 
@@ -312,7 +309,6 @@ public class CommonBusinessService {
         private final String contractFile;
         private final Long id;
         private final String contractName;
-        private final String filePathPrefix;
 
         private RemoteSystemService remoteSystemService;
         private String eSignUrl;
@@ -329,8 +325,7 @@ public class CommonBusinessService {
                             RemoteSystemService remoteSystemService,
                             String eSignUrl,
                             KwcContractLogisticsMapper kwcContractLogisticsMapper,
-                            KwcContractTradeMapper kwcContractTradeMapper,
-                            String filePathPrefix) {
+                            KwcContractTradeMapper kwcContractTradeMapper) {
             this.firstAccount = firstAccount;
             this.secondAccount = secondAccount;
             this.orgFirst = orgFirst;
@@ -342,7 +337,6 @@ public class CommonBusinessService {
             this.eSignUrl = eSignUrl;
             this.kwcContractLogisticsMapper = kwcContractLogisticsMapper;
             this.kwcContractTradeMapper = kwcContractTradeMapper;
-            this.filePathPrefix = filePathPrefix;
         }
 
         @Override
@@ -351,7 +345,7 @@ public class CommonBusinessService {
             JSONArray jsonArray = JSONArray.parseArray(contractFile);
             JSONObject jsonObject = jsonArray.getJSONObject(0);
             String fileName = jsonObject.getString("name");
-            String url = filePathPrefix + jsonObject.getString("url");
+            String url = FileUtils.splice(jsonObject.getString("url"));
             File file = getFileByHttpURL(url, fileName);
             List<Long> entIds = new ArrayList<>(2);
             entIds.add(orgFirst);

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -1,8 +1,12 @@
 package com.sckw.contract.service;
 
+import java.io.File;
 import java.util.Date;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -143,7 +147,17 @@ public class KwcContractLogisticsService {
         long contactId = new IdWorker(1L).nextId();
         kwcContractLogistics.setId(contactId);
         kwcContractLogistics.setStatus(ContractStatusEnum.SAVE.getCode());
-        kwcContractLogistics.setSigningUrl(reqVo.getContractFile());
+        String contractFile = reqVo.getContractFile();
+        if (StringUtils.isNotBlank(contractFile)) {
+            JSONArray jsonArray = JSONArray.parseArray(contractFile);
+            for (int n = 0; n < jsonArray.size(); n++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(n);
+                String url = jsonObject.getString("url");
+                jsonObject.put("url", FileUtils.replaceAll(url));
+            }
+            kwcContractLogistics.setSigningUrl(JSON.toJSONString(jsonArray));
+        }
+
         if (kwcContractLogisticsMapper.insert(kwcContractLogistics) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
@@ -347,8 +361,27 @@ public class KwcContractLogisticsService {
 
         //合同文件
         List<String> fileList = new ArrayList<>();
-        fileList.add(kwcContractLogistics.getSignedUrl());
-        fileList.add(kwcContractLogistics.getSigningUrl());
+        String signedUrl = kwcContractLogistics.getSignedUrl();
+        if (StringUtils.isNotBlank(signedUrl)) {
+            JSONArray jsonArray = JSONArray.parseArray(signedUrl);
+            for (int n = 0; n < jsonArray.size(); n++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(n);
+                String url = jsonObject.getString("url");
+                jsonObject.put("url", FileUtils.splice(url));
+            }
+            fileList.add(JSON.toJSONString(jsonArray));
+        }
+
+        String signingUrl = kwcContractLogistics.getSigningUrl();
+        if (StringUtils.isNotBlank(signingUrl)) {
+            JSONArray jsonArray = JSONArray.parseArray(signingUrl);
+            for (int n = 0; n < jsonArray.size(); n++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(n);
+                String url = jsonObject.getString("url");
+                jsonObject.put("url", FileUtils.splice(url));
+            }
+            fileList.add(JSON.toJSONString(jsonArray));
+        }
         contractLogisticsDetailResVo.setContractFile(fileList.stream().filter(StringUtils::isNotBlank).toList());
 
         //审批流程信息
@@ -413,8 +446,7 @@ public class KwcContractLogisticsService {
                     reqVo.getBaseInfo().getCarrierEntId(),
                     reqVo.getContractFile(),
                     id,
-                    reqVo.getBaseInfo().getContractName(),
-                    filePathPrefix);
+                    reqVo.getBaseInfo().getContractName());
             //发送消息
             sendLogisticsMessage(kwcContractLogistics);
         }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -7,6 +7,8 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -228,7 +230,17 @@ public class KwcContractTradeService {
         long contactId = new IdWorker(1L).nextId();
         kwcContractTrade.setId(contactId);
         kwcContractTrade.setStatus(ContractStatusEnum.SAVE.getCode());
-        kwcContractTrade.setSigningUrl(reqVo.getContractFile());
+        String contractFile = reqVo.getContractFile();
+        if (StringUtils.isNotBlank(contractFile)) {
+            JSONArray jsonArray = JSONArray.parseArray(contractFile);
+            for (int n = 0; n < jsonArray.size(); n++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(n);
+                String url = jsonObject.getString("url");
+                jsonObject.put("url", FileUtils.replaceAll(url));
+            }
+            kwcContractTrade.setSigningUrl(JSON.toJSONString(jsonArray));
+        }
+
         if (kwcContractTradeMapper.insert(kwcContractTrade) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
@@ -427,8 +439,28 @@ public class KwcContractTradeService {
 
         //合同文件
         List<String> fileList = new ArrayList<>();
-        fileList.add(kwcContractTrade.getSigningUrl());
-        fileList.add(kwcContractTrade.getSignedUrl());
+        String signedUrl = kwcContractTrade.getSignedUrl();
+        if (StringUtils.isNotBlank(signedUrl)) {
+            JSONArray jsonArray = JSONArray.parseArray(signedUrl);
+            for (int n = 0; n < jsonArray.size(); n++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(n);
+                String url = jsonObject.getString("url");
+                jsonObject.put("url", FileUtils.splice(url));
+            }
+            fileList.add(JSON.toJSONString(jsonArray));
+        }
+
+        String signingUrl = kwcContractTrade.getSigningUrl();
+        if (StringUtils.isNotBlank(signingUrl)) {
+            JSONArray jsonArray = JSONArray.parseArray(signingUrl);
+            for (int n = 0; n < jsonArray.size(); n++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(n);
+                String url = jsonObject.getString("url");
+                jsonObject.put("url", FileUtils.splice(url));
+            }
+            fileList.add(JSON.toJSONString(jsonArray));
+        }
+        
         contractTradeDetailResVo.setContractFile(fileList.stream().filter(StringUtils::isNotBlank).toList());
 
         //流程记录
@@ -492,8 +524,7 @@ public class KwcContractTradeService {
                     reqVo.getBaseInfo().getPurchaseEntId(),
                     reqVo.getContractFile(),
                     id,
-                    reqVo.getBaseInfo().getContractName(),
-                    filePathPrefix);
+                    reqVo.getBaseInfo().getContractName());
             sendTradeMessage(kwcContractTrade);
         }
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/dto/TransportDemandExport.java

@@ -20,8 +20,6 @@ public class TransportDemandExport implements Serializable {
     @Serial
     private static final long serialVersionUID = -7951209824419422786L;
 
-    @ExcelProperty(value = "序号" )
-    private String serialNumber;
 
     @ExcelProperty(value = "状态")
     private String statusLabel;

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/dto/WantBuyExport.java

@@ -20,10 +20,6 @@ public class WantBuyExport implements Serializable {
     @Serial
     private static final long serialVersionUID = 7225805024416842861L;
 
-
-    @ExcelProperty(value = "序号" )
-    private String serialNumber;
-
     @ExcelProperty(value = "状态")
     private String statusLabel;
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTransportDemandService.java

@@ -37,7 +37,6 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -381,13 +380,16 @@ public class KwoTransportDemandService {
                     new HashMap<>() : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
         }
         List<TransportDemandExport> result = Lists.newArrayList();
-        AtomicInteger i = new AtomicInteger(1);
         demands.forEach(e -> {
             TransportDemandExport export = BeanUtils.copyProperties(e, TransportDemandExport.class);
+            String loadAreaName = Objects.nonNull(e.getLoadAreaName()) ? e.getLoadAreaName() : "";
+            String loadDetailAddress = Objects.nonNull(e.getLoadDetailAddress()) ? e.getLoadDetailAddress() : "";
+            String unloadAreaName = Objects.nonNull(e.getUnloadAreaName()) ? e.getUnloadAreaName() : "";
+            String unloadDetailAddress = Objects.nonNull(e.getUnloadDetailAddress()) ? e.getUnloadDetailAddress() : "";
             export.setGoodsTypeLabel(productNameMap.get(e.getGoodsType()))
                     .setStatusLabel(statusMap.get(String.valueOf(e.getStatus())))
-                    .setLoadAddress(e.getLoadAreaName() + e.getLoadDetailAddress()).setSerialNumber(String.valueOf(i.getAndIncrement()))
-                    .setUnloadAddress(e.getUnloadAreaName() + e.getUnloadDetailAddress())
+                    .setLoadAddress(loadAreaName + loadDetailAddress)
+                    .setUnloadAddress(unloadAreaName + unloadDetailAddress)
                     .setDeadline(Objects.isNull(e.getDeadline()) ? null : DateUtils.format(e.getDeadline(), DateUtils.DATE_PATTERN))
                     .setCreateTime(DateUtil.getDateTime(e.getCreateTime()))
                     .setUpdateTime(DateUtil.getDateTime(e.getUpdateTime()))
@@ -533,11 +535,15 @@ public class KwoTransportDemandService {
         List<TransportDemandSquaresListRes> result = Lists.newArrayList();
         list.forEach(e -> {
             TransportDemandSquaresListRes res = BeanUtils.copyProperties(e, TransportDemandSquaresListRes.class);
+            String loadAreaName = Objects.nonNull(e.getLoadAreaName()) ? e.getLoadAreaName() : "";
+            String loadDetailAddress = Objects.nonNull(e.getLoadDetailAddress()) ? e.getLoadDetailAddress() : "";
+            String unloadAreaName = Objects.nonNull(e.getUnloadAreaName()) ? e.getUnloadAreaName() : "";
+            String unloadDetailAddress = Objects.nonNull(e.getUnloadDetailAddress()) ? e.getUnloadDetailAddress() : "";
             EntCacheResDto ent = entMap.get(e.getEntId());
             res.setGoodsTypeLabel(productNameMap.get(e.getGoodsType()))
                     .setTradingLabel(tradeMap.get(e.getTrading()))
-                    .setLoadAddress(e.getLoadAreaName() + e.getLoadDetailAddress())
-                    .setUnloadAddress(e.getUnloadAreaName() + e.getUnloadDetailAddress())
+                    .setLoadAddress(loadAreaName + loadDetailAddress)
+                    .setUnloadAddress(unloadAreaName + unloadDetailAddress)
                     .setCreateTime(DateUtils.format(e.getCreateTime()))
                     .setDemandUnit(Objects.nonNull(ent) ? ent.getFirmName() : null);
             result.add(res);

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwpWantBuyService.java

@@ -37,7 +37,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -572,14 +571,12 @@ public class KwpWantBuyService {
                     new HashMap<>() : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
         }
         List<WantBuyExport> result = new ArrayList<>();
-        AtomicInteger i = new AtomicInteger(1);
         wantBuyDto.forEach(e -> {
             WantBuyExport export = BeanUtils.copyProperties(e, WantBuyExport.class);
             List<String> tradings = e.getWantBuyTradings().stream()
                     .map(wantBuyTradingRes -> tradeMap.get(wantBuyTradingRes.getTrading()))
                     .collect(Collectors.toList());
-            export.setSerialNumber(String.valueOf(i.getAndIncrement()))
-                    .setStatusLabel(statusMap.get(String.valueOf(e.getStatus())))
+            export.setStatusLabel(statusMap.get(String.valueOf(e.getStatus())))
                     .setEntName(Objects.nonNull(entMap.get(e.getEntId())) ? entMap.get(e.getEntId()).getFirmName() : null)
                     .setTradings(String.join(Global.COMMA, tradings))
                     .setGoodsTypeLabel(productNameMap.get(e.getGoodsType()))

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementTradeController.java

@@ -154,6 +154,7 @@ public class KwpSettlementTradeController {
         settlementReq.check();
         settlementReq.setUnitType(TradeUnitType.SELL);
         settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
+        settlementReq.setEntId(LoginUserHolder.getEntId());
         List<SettlementTradeDto> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
         return this.export(response, list);
     }

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementLogisticsMapper.xml

@@ -128,7 +128,7 @@
             and ( l.name like concat('%'
             , #{settlementReq.keywords,jdbcType=VARCHAR}
             , '%')
-            or l.l_ledger_no like concat('%'
+                or l.l_ledger_no like concat('%'
             , #{settlementReq.keywords,jdbcType=VARCHAR}
             , '%')
                 or lu2.firm_name like concat('%'
@@ -376,7 +376,7 @@
                                                             lu.unit_type = #{unitType,jdbcType=INTEGER}
         <where>
             s.del_flag = 0
-            and s.id = #{id,jdbcType=BIGINT}
+              and s.id = #{id,jdbcType=BIGINT}
         </where>
     </select>
 
@@ -415,13 +415,17 @@
               and s.del_flag = 0
               and lu.del_flag = 0
               and lu2.del_flag = 0
-            <include refid="settlementLogisticsSelectWhere"/>
-            <if test="ids != null and ids.size() > 0">
-                and s.id in
-                <foreach collection="ids" item="id" close=")" open="(" separator=",">
-                    #{id,jdbcType=BIGINT}
-                </foreach>
-            </if>
+            <choose>
+                <when test="ids != null and ids.size() > 0">
+                    and s.id in
+                    <foreach collection="ids" item="id" close=")" open="(" separator=",">
+                        #{id,jdbcType=BIGINT}
+                    </foreach>
+                </when>
+                <otherwise>
+                    <include refid="settlementLogisticsSelectWhere"/>
+                </otherwise>
+            </choose>
         </where>
         order by s.update_time desc
     </select>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementTradeMapper.xml

@@ -551,7 +551,7 @@
                     <if test="settlementReq.trading != null and settlementReq.trading != ''">
                         and klt.trading = #{settlementReq.trading,jdbcType=VARCHAR}
                     </if>
-                    <if test="settlementReq.status != null">
+                    <if test="settlementReq.status != null and settlementReq.status != 0">
                         and kst.status = #{settlementReq.status,jdbcType=INTEGER}
                     </if>
                     <if test="settlementReq.startCreateTime != null and settlementReq.startCreateTime != '' and settlementReq.endCreateTime != null and settlementReq.endCreateTime != ''">

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/GoodsListExport.java

@@ -21,9 +21,6 @@ public class GoodsListExport implements Serializable {
     @Serial
     private static final long serialVersionUID = 6833195135537265912L;
 
-    @ExcelProperty(value = "序号" )
-    private String serialNumber;
-
     @ExcelProperty(value = "上架状态")
     private String statusLabel;
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -53,7 +53,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -582,11 +581,9 @@ public class KwpGoodsService {
     public List<GoodsListExport> getExportResults(List<KwpGoods> list) {
         List<GoodsList> goodsLists = buildGoodLists(list);
         List<GoodsListExport> result = new ArrayList<>(list.size());
-        AtomicInteger i = new AtomicInteger(1);
         goodsLists.forEach(e -> {
             GoodsListExport export = BeanUtils.copyProperties(e, GoodsListExport.class);
-            export.setSerialNumber(String.valueOf(i.getAndIncrement()))
-                    .setAmount(Objects.isNull(e.getAmount()) ? null : String.valueOf(e.getAmount()))
+            export.setAmount(Objects.isNull(e.getAmount()) ? null : String.valueOf(e.getAmount()))
                     .setHighestPrice(Objects.isNull(e.getHighestPrice()) ? null : String.valueOf(e.getHighestPrice()))
                     .setLowestPrice(Objects.isNull(e.getLowestPrice()) ? null : String.valueOf(e.getLowestPrice()))
                     .setAddedTime(Objects.isNull(e.getAddedTime()) ? null : DateUtil.getDateTime(e.getAddedTime()))

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

@@ -31,7 +31,6 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -449,7 +448,6 @@ public class KwOrderService {
             tradeMap = new HashMap<>();
         }
         List<TradeOrderListExport> list = new ArrayList<>();
-        AtomicInteger i = new AtomicInteger(1);
         orders.forEach(e -> {
             Double waitEntrustAmount = getWaitEntrustAmount(e.getAmount(), e.getEntrustAmount());
             String loadCityName = Objects.isNull(e.getLoadCityName()) ? "" : e.getLoadCityName();
@@ -457,8 +455,7 @@ public class KwOrderService {
             String unloadCityName = Objects.isNull(e.getUnloadCityName()) ? "" : e.getUnloadCityName();
             String unloadDetailAddress = Objects.isNull(e.getUnloadDetailAddress()) ? "" : e.getUnloadDetailAddress();
             TradeOrderListExport export = BeanUtils.copyProperties(e, TradeOrderListExport.class);
-            export.setSerialNumber(String.valueOf(i.getAndIncrement()))
-                    .setStatus(statusMap.get(String.valueOf(e.getStatus())))
+            export.setStatus(statusMap.get(String.valueOf(e.getStatus())))
                     .setUnitPrice(String.valueOf(setScale(e.getUnitPrice())))
                     .setAmount(String.valueOf(setScale(e.getAmount())))
                     .setPrice(String.valueOf(setScale(e.getPrice())))

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

@@ -20,9 +20,6 @@ public class TradeOrderListExport implements Serializable {
     @Serial
     private static final long serialVersionUID = -5895230502149598364L;
 
-    @ExcelProperty(value = "序号" )
-    private String serialNumber;
-
     @ExcelProperty(value = "状态" )
     private String status;
 
@@ -50,6 +47,9 @@ public class TradeOrderListExport implements Serializable {
     @ExcelProperty(value = "订单金额")
     private String price;
 
+    @ExcelProperty(value = "税率/%")
+    private String goodsTaxRate;
+
     @ExcelProperty(value = "已分配运输量")
     private String entrustAmount;
 

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

@@ -126,6 +126,8 @@ public class OrderListRes {
      */
     private String goodsSpec;
 
+    private String goodsTaxRate;
+
     /**
      * 商品缩略图
      */

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -375,6 +375,8 @@ public class KwsEnterpriseService {
             kwsEntCertificate.setStatus(ApprovalEnum.PROCESS.getCode());
             BeanUtils.copyProperties(businessLicense, kwsEntCertificate);
             kwsEntCertificate.setId(new IdWorker(1).nextId());
+            kwsEntCertificate.setCertificateMain(FileUtils.replaceAll(businessLicense.getCertificateMain()));
+            kwsEntCertificate.setCertificateRevolt(FileUtils.replaceAll(businessLicense.getCertificateRevolt()));
             kwsEntCertificates.add(kwsEntCertificate);
         }
         if (kwsEntCertificateDao.saveBatch(kwsEntCertificates) != kwsEntCertificates.size()) {
@@ -620,6 +622,8 @@ public class KwsEnterpriseService {
             CertificateResVo certificateResVo = new CertificateResVo();
             certificateResVo.setTypeName(Objects.requireNonNull(CertificateTypeEnum.getName(item.getType())).getName());
             BeanUtils.copyProperties(item, certificateResVo);
+            certificateResVo.setCertificateMain(FileUtils.splice(certificateResVo.getCertificateMain()));
+            certificateResVo.setCertificateRevolt(FileUtils.splice(certificateResVo.getCertificateRevolt()));
             list.add(certificateResVo);
         });
         return list;