diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java index 8eddeb7..72e70fd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -16,6 +17,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_environment_record") public class BusinessEnvironmentRecord implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java index 8eddeb7..72e70fd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -16,6 +17,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_environment_record") public class BusinessEnvironmentRecord implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 9e960f6..b9e7712 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -6,8 +6,10 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -18,6 +20,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_order") @ApiModel @@ -98,6 +101,6 @@ private String updateTime; @TableField(exist = false) - private List customerSampleInfoList; + private List customerSampleInfoList = new ArrayList<>(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java index 8eddeb7..72e70fd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -16,6 +17,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_environment_record") public class BusinessEnvironmentRecord implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 9e960f6..b9e7712 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -6,8 +6,10 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -18,6 +20,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_order") @ApiModel @@ -98,6 +101,6 @@ private String updateTime; @TableField(exist = false) - private List customerSampleInfoList; + private List customerSampleInfoList = new ArrayList<>(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index 91824d5..f43a5f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -6,13 +6,15 @@ import com.casic.missiles.annotation.DictCodeField; import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; -import com.casic.missiles.model.equipment.EquipmentApplyFile; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.meter.MeterFile; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -23,6 +25,8 @@ * @author zt * @since 2023-02-02 */ +@NoArgsConstructor +@AllArgsConstructor @Data @TableName("business_original_record") public class BusinessOriginalRecord implements Serializable { @@ -127,29 +131,29 @@ */ @TableField(exist = false) @ApiModelProperty(value = "委托单信息", dataType = "Object") - private BusinessOrder businessOrder; + private BusinessOrder businessOrder = new BusinessOrder(); /** * 环境记录单信息 */ @TableField(exist = false) @ApiModelProperty(value = "环境记录单信息", dataType = "Object") - private BusinessEnvironmentRecord businessEnvironmentRecord; + private BusinessEnvironmentRecord businessEnvironmentRecord = new BusinessEnvironmentRecord(); /** * 样品信息 */ @TableField(exist = false) @ApiModelProperty(value = "样品信息", dataType = "Object") - private CustomerSampleInfo customerSampleInfo; + private CustomerSampleInfo customerSampleInfo = new CustomerSampleInfo(); @TableField(exist = false) @ApiModelProperty(value = "监测设备", dataType = "List") - private List equipmentInfoList; + private List equipmentInfoList = new ArrayList<>(); /** * 技术文件 */ @TableField(exist = false) @ApiModelProperty(value = "技术文件", dataType = "List") - private List fileList; + private List fileList = new ArrayList<>(); @TableField(exist = false) @ApiModelProperty(value = "检校类别名称", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java index 8eddeb7..72e70fd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -16,6 +17,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_environment_record") public class BusinessEnvironmentRecord implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 9e960f6..b9e7712 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -6,8 +6,10 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -18,6 +20,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_order") @ApiModel @@ -98,6 +101,6 @@ private String updateTime; @TableField(exist = false) - private List customerSampleInfoList; + private List customerSampleInfoList = new ArrayList<>(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index 91824d5..f43a5f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -6,13 +6,15 @@ import com.casic.missiles.annotation.DictCodeField; import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; -import com.casic.missiles.model.equipment.EquipmentApplyFile; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.meter.MeterFile; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -23,6 +25,8 @@ * @author zt * @since 2023-02-02 */ +@NoArgsConstructor +@AllArgsConstructor @Data @TableName("business_original_record") public class BusinessOriginalRecord implements Serializable { @@ -127,29 +131,29 @@ */ @TableField(exist = false) @ApiModelProperty(value = "委托单信息", dataType = "Object") - private BusinessOrder businessOrder; + private BusinessOrder businessOrder = new BusinessOrder(); /** * 环境记录单信息 */ @TableField(exist = false) @ApiModelProperty(value = "环境记录单信息", dataType = "Object") - private BusinessEnvironmentRecord businessEnvironmentRecord; + private BusinessEnvironmentRecord businessEnvironmentRecord = new BusinessEnvironmentRecord(); /** * 样品信息 */ @TableField(exist = false) @ApiModelProperty(value = "样品信息", dataType = "Object") - private CustomerSampleInfo customerSampleInfo; + private CustomerSampleInfo customerSampleInfo = new CustomerSampleInfo(); @TableField(exist = false) @ApiModelProperty(value = "监测设备", dataType = "List") - private List equipmentInfoList; + private List equipmentInfoList = new ArrayList<>(); /** * 技术文件 */ @TableField(exist = false) @ApiModelProperty(value = "技术文件", dataType = "List") - private List fileList; + private List fileList = new ArrayList<>(); @TableField(exist = false) @ApiModelProperty(value = "检校类别名称", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index 9647d33..f4c9c29 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -6,9 +6,11 @@ import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +@NoArgsConstructor @Data @TableName("customer_sample_info") public class CustomerSampleInfo implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java index 8eddeb7..72e70fd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -16,6 +17,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_environment_record") public class BusinessEnvironmentRecord implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 9e960f6..b9e7712 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -6,8 +6,10 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -18,6 +20,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_order") @ApiModel @@ -98,6 +101,6 @@ private String updateTime; @TableField(exist = false) - private List customerSampleInfoList; + private List customerSampleInfoList = new ArrayList<>(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index 91824d5..f43a5f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -6,13 +6,15 @@ import com.casic.missiles.annotation.DictCodeField; import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; -import com.casic.missiles.model.equipment.EquipmentApplyFile; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.meter.MeterFile; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -23,6 +25,8 @@ * @author zt * @since 2023-02-02 */ +@NoArgsConstructor +@AllArgsConstructor @Data @TableName("business_original_record") public class BusinessOriginalRecord implements Serializable { @@ -127,29 +131,29 @@ */ @TableField(exist = false) @ApiModelProperty(value = "委托单信息", dataType = "Object") - private BusinessOrder businessOrder; + private BusinessOrder businessOrder = new BusinessOrder(); /** * 环境记录单信息 */ @TableField(exist = false) @ApiModelProperty(value = "环境记录单信息", dataType = "Object") - private BusinessEnvironmentRecord businessEnvironmentRecord; + private BusinessEnvironmentRecord businessEnvironmentRecord = new BusinessEnvironmentRecord(); /** * 样品信息 */ @TableField(exist = false) @ApiModelProperty(value = "样品信息", dataType = "Object") - private CustomerSampleInfo customerSampleInfo; + private CustomerSampleInfo customerSampleInfo = new CustomerSampleInfo(); @TableField(exist = false) @ApiModelProperty(value = "监测设备", dataType = "List") - private List equipmentInfoList; + private List equipmentInfoList = new ArrayList<>(); /** * 技术文件 */ @TableField(exist = false) @ApiModelProperty(value = "技术文件", dataType = "List") - private List fileList; + private List fileList = new ArrayList<>(); @TableField(exist = false) @ApiModelProperty(value = "检校类别名称", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index 9647d33..f4c9c29 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -6,9 +6,11 @@ import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +@NoArgsConstructor @Data @TableName("customer_sample_info") public class CustomerSampleInfo implements Serializable { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index f977cb3..ed19375 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -32,6 +32,7 @@ import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.response.ResponseData; @@ -152,6 +153,9 @@ if (certificateReport.getOriginalRecordId() != null) { try { certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); + if(Objects.isNull(certificateReport.getBusinessOriginalRecord())){ + certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); + } certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS,certificateReport.getCertificateReportType())); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java index 8eddeb7..72e70fd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -16,6 +17,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_environment_record") public class BusinessEnvironmentRecord implements Serializable { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java index 9e960f6..b9e7712 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.java @@ -6,8 +6,10 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -18,6 +20,7 @@ * @author wangpeng * @since 2023-02-02 */ +@NoArgsConstructor @Data @TableName("business_order") @ApiModel @@ -98,6 +101,6 @@ private String updateTime; @TableField(exist = false) - private List customerSampleInfoList; + private List customerSampleInfoList = new ArrayList<>(); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java index 91824d5..f43a5f7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecord.java @@ -6,13 +6,15 @@ import com.casic.missiles.annotation.DictCodeField; import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.model.customer.CustomerSampleInfo; -import com.casic.missiles.model.equipment.EquipmentApplyFile; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.meter.MeterFile; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -23,6 +25,8 @@ * @author zt * @since 2023-02-02 */ +@NoArgsConstructor +@AllArgsConstructor @Data @TableName("business_original_record") public class BusinessOriginalRecord implements Serializable { @@ -127,29 +131,29 @@ */ @TableField(exist = false) @ApiModelProperty(value = "委托单信息", dataType = "Object") - private BusinessOrder businessOrder; + private BusinessOrder businessOrder = new BusinessOrder(); /** * 环境记录单信息 */ @TableField(exist = false) @ApiModelProperty(value = "环境记录单信息", dataType = "Object") - private BusinessEnvironmentRecord businessEnvironmentRecord; + private BusinessEnvironmentRecord businessEnvironmentRecord = new BusinessEnvironmentRecord(); /** * 样品信息 */ @TableField(exist = false) @ApiModelProperty(value = "样品信息", dataType = "Object") - private CustomerSampleInfo customerSampleInfo; + private CustomerSampleInfo customerSampleInfo = new CustomerSampleInfo(); @TableField(exist = false) @ApiModelProperty(value = "监测设备", dataType = "List") - private List equipmentInfoList; + private List equipmentInfoList = new ArrayList<>(); /** * 技术文件 */ @TableField(exist = false) @ApiModelProperty(value = "技术文件", dataType = "List") - private List fileList; + private List fileList = new ArrayList<>(); @TableField(exist = false) @ApiModelProperty(value = "检校类别名称", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index 9647d33..f4c9c29 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -6,9 +6,11 @@ import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; +@NoArgsConstructor @Data @TableName("customer_sample_info") public class CustomerSampleInfo implements Serializable { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index f977cb3..ed19375 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -32,6 +32,7 @@ import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.model.response.ResponseData; @@ -152,6 +153,9 @@ if (certificateReport.getOriginalRecordId() != null) { try { certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); + if(Objects.isNull(certificateReport.getBusinessOriginalRecord())){ + certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); + } certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS,certificateReport.getCertificateReportType())); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index def45bb..e57b8f4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -27,17 +27,14 @@ import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper; import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper; -import com.casic.missiles.mapper.meter.MeterOrganizeMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.meter.MeterOrganize; import com.casic.missiles.model.page.PageQuery; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; -import com.casic.missiles.service.meter.IMeterOrganizeService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.extern.slf4j.Slf4j; @@ -360,8 +357,12 @@ Map meterOrganizeMap = deptList.stream() .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName)); for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) { - equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept()))); - equipmentFixedAssets.setMesureDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getMesureDept()))); + if(Objects.nonNull(equipmentFixedAssets.getUseDept())){ + equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept()))); + } + if(Objects.nonNull(equipmentFixedAssets.getMesureDept())){ + equipmentFixedAssets.setMesureDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getMesureDept()))); + } } return equipmentFixedAssetsList; }