fix(JG)：气瓶导入功能开发Bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/PressureVesselListener.java

@@ -96,8 +96,8 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
                 if (equCodeList.contains(data.getEquCode())) {
                     result.append("设备代码不能重复；");
                 }
-            }
                 this.checkEquCodeUniqueness(data.getEquCode());
+            }
             checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空");
             checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空");
             Optional.ofNullable(data.getDesignDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计日期格式不正确"));
@@ -201,7 +201,9 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
         BeanUtils.copyProperties(data, designInfo);
         designInfo.setRecord(record);
         designInfo.setRecDate(date);
+        if (data.getDesignDate() != null){
             designInfo.setDesignDate(DateUtil.parse(data.getDesignDate(), "yyyy-MM-dd"));
+        }
         designInfoList.add(designInfo);
 
         //制造信息

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -1946,7 +1946,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             inputStream.close();
             return pressureVesselListener.getResult();
         } catch (Exception e) {
-            String err = (e.getCause() instanceof BadRequest) ? "模版数据填写有误：" + e.getCause().getMessage() : "导入时出现异常：" + e.getMessage();
+            String err = (e.getCause() instanceof BadRequest) ? "模版数据填写有误：" + e.getCause().getMessage() : "导入时出现异常：请联系管理员！" ;
             throw new BadRequest(err);
         }
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl

@@ -897,7 +897,7 @@
 						<w:sz w:val="24"/>
 					</w:rPr>
 					<w:pict>
-						<v:shape id="文本框 16" o:spid="_x0000_s1033" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:393.25pt;margin-top:455.45pt;height:38.25pt;width:134.3pt;z-index:251671552;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
+						<v:shape id="文本框 16" o:spid="_x0000_s1033" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:393.25pt;margin-top:455.45pt;height:53.25pt;width:134.3pt;z-index:251671552;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
 							<v:path/>
 							<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
 							<v:stroke on="f" weight="0.5pt"/>
@@ -1441,7 +1441,7 @@
 						<w:sz w:val="24"/>
 					</w:rPr>
 					<w:pict>
-						<v:shape id="文本框 18" o:spid="_x0000_s1036" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:135.25pt;margin-top:502.7pt;height:37.45pt;width:135.7pt;z-index:251673600;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
+						<v:shape id="文本框 18" o:spid="_x0000_s1036" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:135.25pt;margin-top:502.7pt;height:53.25pt;width:135.7pt;z-index:251673600;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
 							<v:path/>
 							<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
 							<v:stroke on="f" weight="0.5pt"/>