diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a662665..daf917f 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 com.github.oshi diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a662665..daf917f 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 98c3f25..81ca8b7 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a662665..daf917f 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 98c3f25..81ca8b7 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4e367..2d0500a 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 compile diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a662665..daf917f 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 98c3f25..81ca8b7 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4e367..2d0500a 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 4d90f45..d7cff42 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a662665..daf917f 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 98c3f25..81ca8b7 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4e367..2d0500a 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 4d90f45..d7cff42 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 4ee017a..9d5cd64 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -209,7 +209,7 @@ @TableField(exist = false) private List orderSampleList; - @ApiModelProperty(value = "样品列表(详情接口出参使用)", dataType = "List") + @ApiModelProperty(value = "列表(详情接口出参使用)", dataType = "List") @TableField(exist = false) private List sampleList; } diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a662665..daf917f 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 98c3f25..81ca8b7 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4e367..2d0500a 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 4d90f45..d7cff42 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 4ee017a..9d5cd64 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -209,7 +209,7 @@ @TableField(exist = false) private List orderSampleList; - @ApiModelProperty(value = "样品列表(详情接口出参使用)", dataType = "List") + @ApiModelProperty(value = "列表(详情接口出参使用)", dataType = "List") @TableField(exist = false) private List sampleList; } diff --git a/casic-metering-portal/pom.xml b/casic-metering-portal/pom.xml index 1b9ada9..ccdbaf0 100644 --- a/casic-metering-portal/pom.xml +++ b/casic-metering-portal/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a662665..daf917f 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 98c3f25..81ca8b7 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4e367..2d0500a 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 4d90f45..d7cff42 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 4ee017a..9d5cd64 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -209,7 +209,7 @@ @TableField(exist = false) private List orderSampleList; - @ApiModelProperty(value = "样品列表(详情接口出参使用)", dataType = "List") + @ApiModelProperty(value = "列表(详情接口出参使用)", dataType = "List") @TableField(exist = false) private List sampleList; } diff --git a/casic-metering-portal/pom.xml b/casic-metering-portal/pom.xml index 1b9ada9..ccdbaf0 100644 --- a/casic-metering-portal/pom.xml +++ b/casic-metering-portal/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 7e30c2e..0919078 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,13 +16,13 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 org.apache.poi @@ -34,7 +34,7 @@ com.casic casic-metering-common - 2.0.0 + 1.2.2 org.apache.poi diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a662665..daf917f 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 98c3f25..81ca8b7 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4e367..2d0500a 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 4d90f45..d7cff42 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 4ee017a..9d5cd64 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -209,7 +209,7 @@ @TableField(exist = false) private List orderSampleList; - @ApiModelProperty(value = "样品列表(详情接口出参使用)", dataType = "List") + @ApiModelProperty(value = "列表(详情接口出参使用)", dataType = "List") @TableField(exist = false) private List sampleList; } diff --git a/casic-metering-portal/pom.xml b/casic-metering-portal/pom.xml index 1b9ada9..ccdbaf0 100644 --- a/casic-metering-portal/pom.xml +++ b/casic-metering-portal/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 7e30c2e..0919078 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,13 +16,13 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 org.apache.poi @@ -34,7 +34,7 @@ com.casic casic-metering-common - 2.0.0 + 1.2.2 org.apache.poi diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 041716d..1b0d2f6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import java.io.*; import java.util.Objects; @@ -84,7 +85,7 @@ } else { printDocUrl = populateExcelPrintFile(tempLocalFileDir, filePrintRegister, registerParameters.getCustomFileName()); } - if (registerParameters.getPdf() && printDocUrl.contains(WORD_SUFFIX)) { + if (!ObjectUtils.isEmpty(registerParameters.getPdf()) && registerParameters.getPdf() && printDocUrl.contains(WORD_SUFFIX)) { //默认转为docx,只需要进行docx的替换即可 String pdfNewUrl = printDocUrl.replaceAll(WORD_SUFFIX, PDF_SUFFIX); FilePrintRegisterUtils.wordToPdf(printDocUrl, pdfNewUrl); diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml index a74cb17..93635a7 100644 --- a/casic-metering-api/pom.xml +++ b/casic-metering-api/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 com.casic casic-metering-job - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a662665..daf917f 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 98c3f25..81ca8b7 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index fd4e367..2d0500a 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 2.0.0 + 1.2.2 com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 4d90f45..d7cff42 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java index 4ee017a..9d5cd64 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java @@ -209,7 +209,7 @@ @TableField(exist = false) private List orderSampleList; - @ApiModelProperty(value = "样品列表(详情接口出参使用)", dataType = "List") + @ApiModelProperty(value = "列表(详情接口出参使用)", dataType = "List") @TableField(exist = false) private List sampleList; } diff --git a/casic-metering-portal/pom.xml b/casic-metering-portal/pom.xml index 1b9ada9..ccdbaf0 100644 --- a/casic-metering-portal/pom.xml +++ b/casic-metering-portal/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-service - 2.0.0 + 1.2.2 org.springframework.boot diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index 7e30c2e..0919078 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering com.casic - 2.0.0 + 1.2.2 4.0.0 @@ -16,13 +16,13 @@ com.casic casic-metering-dao - 2.0.0 + 1.2.2 com.casic casic-metering-model - 2.0.0 + 1.2.2 org.apache.poi @@ -34,7 +34,7 @@ com.casic casic-metering-common - 2.0.0 + 1.2.2 org.apache.poi diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 041716d..1b0d2f6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; import java.io.*; import java.util.Objects; @@ -84,7 +85,7 @@ } else { printDocUrl = populateExcelPrintFile(tempLocalFileDir, filePrintRegister, registerParameters.getCustomFileName()); } - if (registerParameters.getPdf() && printDocUrl.contains(WORD_SUFFIX)) { + if (!ObjectUtils.isEmpty(registerParameters.getPdf()) && registerParameters.getPdf() && printDocUrl.contains(WORD_SUFFIX)) { //默认转为docx,只需要进行docx的替换即可 String pdfNewUrl = printDocUrl.replaceAll(WORD_SUFFIX, PDF_SUFFIX); FilePrintRegisterUtils.wordToPdf(printDocUrl, pdfNewUrl); diff --git a/pom.xml b/pom.xml index bee8ce1..f876e88 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering - 2.0.0 + 1.2.2 casic-metering pom @@ -19,6 +19,7 @@ com.casic casic-boot-starter-parent 2.0.0.alpha + UTF-8