fix(jg):气瓶导入添加检验日期非必填

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -284,7 +284,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
      **/
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/importData")
-    @ApiOperation(httpMethod = "POST", value = "气瓶批量导入", notes = "气瓶批量导入")
+    @ApiOperation(httpMethod = "POST", value = "气瓶批量导入校验", notes = "气瓶批量导入校验")
     public ResponseModel<?> importPressureData(@RequestPart("file") MultipartFile multipartFile) throws Exception {
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.importPressureData(multipartFile));
     }

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

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
@@ -4451,8 +4452,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             inspectionDetectionInfo.setRecDate(new Date());
             inspectionDetectionInfo.setInspectType("ZZJDJY");
             inspectionDetectionInfo.setInspectConclusion("6040");// 默认合格
-            inspectionDetectionInfo.setInspectDate(DateUtil.parse(data.getInspectDate(), "yyyy-MM-dd"));
-            inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(data.getNextInspectDate(), "yyyy-MM-dd"));
+            Optional.ofNullable(data.getInspectDate())
+                    .filter(StrUtil::isNotBlank)
+                    .map(s -> DateUtil.parse(s, "yyyy-MM-dd"))
+                    .ifPresent(inspectionDetectionInfo::setInspectDate);
+            Optional.ofNullable(data.getNextInspectDate())
+                    .filter(StrUtil::isNotBlank)
+                    .map(s -> DateUtil.parse(s, "yyyy-MM-dd"))
+                    .ifPresent(inspectionDetectionInfo::setNextInspectDate);
             // 根据条件确定增加的年数(杨生元说监管让去掉，企业自己输入)
 //            Optional.ofNullable(data.getInspectDate())
 //                    .filter(s -> !s.trim().isEmpty())