fix(jg):检验报告编号

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoCylinderExcelDto.java

@@ -165,6 +165,10 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     @DateTimeFormat("yyyy-MM-dd")
     private String inspectDate;
 
+    @ApiModelProperty(value = "检验报告编号")
+    @ExcelProperty(value = "检验报告编号")
+    private String inspectReportNo;
+
     //技术参数
     @ExcelProperty(value = "额定质量(kg)", index = 28)
     @ApiModelProperty(value = "额定质量(kg)")

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

@@ -4263,6 +4263,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             //checkInspectOrg(data.getInspectOrgCode(), result);//查询检验检测机构
             checkNotBlank(data.getInspectStaff(), "检测人员名称不能为空；", result);
             checkNotBlank(data.getInspectDate(), "检测日期不能为空；", result);
+            checkNotBlank(data.getInspectReportNo(), "检验报告编号不能为空；", result);
             checkDateFormatCorrect(data.getInspectDate(), "检测日期格式不正确；", result);
             checkNotBlank(data.getSingleBottleVolume(), "单瓶容积不能为空；", result);
             checkNotBlank(data.getChargingMedium(), "充装介质不能为空；", result);

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/JgUseRegistrationServiceImpl.java

@@ -3822,6 +3822,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 inspectionDetectionInfo.setInspectStaff(MapUtil.getStr(map, "inspectStaff"));
                 inspectionDetectionInfo.setNextInspectDate(!StringUtils.isEmpty(map.get("nextInspectDate")) ? DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd") : null);
                 inspectionDetectionInfo.setInspectReport(JSONObject.toJSONString(map.get("inspectReport")));
+                inspectionDetectionInfo.setInspectReportNo(String.valueOf(map.get("inspectReportNo")));
                 iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
 
                 // 生成监管码 96333码
@@ -4174,6 +4175,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             inspectionDetectionInfo.setInspectStaff(String.valueOf(map.get("inspectStaff")));
             inspectionDetectionInfo.setNextInspectDate(!StringUtils.isEmpty(map.get("nextInspectDate")) ? DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd") : null);
             inspectionDetectionInfo.setInspectReport(JSONObject.toJSONString(map.get("inspectReport")));
+            inspectionDetectionInfo.setInspectReportNo(String.valueOf(map.get("inspectReportNo")));
             iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
             // 暂存历史表
             updateHistory(map, record, String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());