Pārlūkot izejas kodu

Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

lvy 2 mēneši atpakaļ
vecāks
revīzija
f28deb75b2

+ 1 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TrialFileSubmitDTO.java

@@ -1,6 +1,7 @@
 package org.springblade.business.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.io.Serializable;

+ 9 - 4
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -1895,11 +1895,16 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
 
                     //自检pdf
                     List<TrialSelfInspectionRecord> trialSelfInspectionRecords = baseMapper.selectList(Wrappers.<TrialSelfInspectionRecord>lambdaQuery()
-                            .select(TrialSelfInspectionRecord::getPdfUrl)
+                            .select(TrialSelfInspectionRecord::getPdfUrl,TrialSelfInspectionRecord::getContractId,TrialSelfInspectionRecord::getId,TrialSelfInspectionRecord::getType)
                             .in(TrialSelfInspectionRecord::getId, Func.toLongList(dto.getIds())));
-                    List<String> pdfURLs = trialSelfInspectionRecords.stream().map(TrialSelfInspectionRecord::getPdfUrl).collect(Collectors.toList());
-                    pdfList.addAll(pdfURLs);
-
+                    if(trialSelfInspectionRecords.size()>0){
+                        for (TrialSelfInspectionRecord record : trialSelfInspectionRecords) {
+                            String pdf = this.getMergePdfToTrialNew(record.getContractId(), record.getId(), record.getType());
+                            pdfList.add(pdf);
+                        }
+                    }
+//                    List<String> pdfURLs = trialSelfInspectionRecords.stream().map(TrialSelfInspectionRecord::getPdfUrl).collect(Collectors.toList());
+//                    pdfList.addAll(pdfURLs);
                     //------第三方、外委------
                 } else if (dto.getType().equals(2) || dto.getType().equals(3)) {
                     if (informationQuery.getPdfTrialUrl() != null) {

+ 3 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/utils/WbsElementUtil.java

@@ -62,7 +62,7 @@ public class WbsElementUtil {
                 case 5:  //数值
                 case 3:  //小数
                 case 4:  //日期
-                    return "50";
+                    return "100";
                 default:
                     return "0";
             }
@@ -79,7 +79,7 @@ public class WbsElementUtil {
                 case "bigint":
                 case "decimal":
                 case "datetime":
-                    return 50;
+                    return 100;
                 default:
                     return 0;
             }
@@ -99,7 +99,7 @@ public class WbsElementUtil {
                 case "数值":
                 case "小数":
                 case "日期":
-                    return 50;
+                    return 100;
                 default:
                     return 0;
             }