diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index da5f329..6f7ca5b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1649,13 +1649,21 @@ if (StringUtils.isNotEmpty(measureData.getPtOne())) { BigDecimal deltaMThrowMax = ptOneDeltaMThrowMap.keySet().stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); measureData.setDeltaMThrowMax(String.valueOf(deltaMThrowMax)); - measureData.setMaxOffsetLoadPoint(ptOneDeltaMThrowMap.get(deltaMThrowMax)); + String max = ptTwoDeltaMThrowMap.get(deltaMThrowMax); + if (StringUtils.isEmpty(max)) { + max = ptTwoDeltaMThrowMap.get(deltaMThrowMax.multiply(BigDecimal.valueOf(-1))); + } + measureData.setMaxOffsetLoadPoint(max); sValue = new BigDecimal(measureData.getLoadPointASValue()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { BigDecimal deltaMThrowMax = ptTwoDeltaMThrowMap.keySet().stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); measureData.setDeltaMThrowMax(String.valueOf(deltaMThrowMax)); - measureData.setMaxOffsetLoadPoint(ptTwoDeltaMThrowMap.get(deltaMThrowMax)); - sValue = new BigDecimal(measureData.getLoadPointASValue()); + String max = ptTwoDeltaMThrowMap.get(deltaMThrowMax); + if (StringUtils.isEmpty(max)) { + max = ptTwoDeltaMThrowMap.get(deltaMThrowMax.multiply(BigDecimal.valueOf(-1))); + } + measureData.setMaxOffsetLoadPoint(max); + sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.DOWN).stripTrailingZeros(); @@ -1674,7 +1682,12 @@ BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 - BigDecimal sValue = new BigDecimal(measureData.getLoadPointASValue()); + BigDecimal sValue = BigDecimal.ZERO; + if (StringUtils.isNotEmpty(measureData.getPtOne())) { + sValue = new BigDecimal(measureData.getLoadPointASValue()); + } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { + sValue = new BigDecimal(measureData.getLoadPointBSValue()); + } BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.DOWN); BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index da5f329..6f7ca5b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1649,13 +1649,21 @@ if (StringUtils.isNotEmpty(measureData.getPtOne())) { BigDecimal deltaMThrowMax = ptOneDeltaMThrowMap.keySet().stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); measureData.setDeltaMThrowMax(String.valueOf(deltaMThrowMax)); - measureData.setMaxOffsetLoadPoint(ptOneDeltaMThrowMap.get(deltaMThrowMax)); + String max = ptTwoDeltaMThrowMap.get(deltaMThrowMax); + if (StringUtils.isEmpty(max)) { + max = ptTwoDeltaMThrowMap.get(deltaMThrowMax.multiply(BigDecimal.valueOf(-1))); + } + measureData.setMaxOffsetLoadPoint(max); sValue = new BigDecimal(measureData.getLoadPointASValue()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { BigDecimal deltaMThrowMax = ptTwoDeltaMThrowMap.keySet().stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); measureData.setDeltaMThrowMax(String.valueOf(deltaMThrowMax)); - measureData.setMaxOffsetLoadPoint(ptTwoDeltaMThrowMap.get(deltaMThrowMax)); - sValue = new BigDecimal(measureData.getLoadPointASValue()); + String max = ptTwoDeltaMThrowMap.get(deltaMThrowMax); + if (StringUtils.isEmpty(max)) { + max = ptTwoDeltaMThrowMap.get(deltaMThrowMax.multiply(BigDecimal.valueOf(-1))); + } + measureData.setMaxOffsetLoadPoint(max); + sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.DOWN).stripTrailingZeros(); @@ -1674,7 +1682,12 @@ BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 - BigDecimal sValue = new BigDecimal(measureData.getLoadPointASValue()); + BigDecimal sValue = BigDecimal.ZERO; + if (StringUtils.isNotEmpty(measureData.getPtOne())) { + sValue = new BigDecimal(measureData.getLoadPointASValue()); + } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { + sValue = new BigDecimal(measureData.getLoadPointBSValue()); + } BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.DOWN); BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 390f354..68d60c6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -30,7 +30,9 @@ SELECT bbdma.*, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS model, eei.manufacture_no AS manufactureNo, - bbdmi.measure_category AS measureCategory, bbdmi.create_user_name AS staffName, bbdmi.trace_date AS traceDate + bbdmi.measure_category AS measureCategory, bbdmi.create_user_name AS staffName, bbdmi.trace_date AS traceDate, + bbdmi.manufacturer AS manufacturer, bbdmi.conclusion AS conclusion, bbdmi.restriction_instruction AS restrictionInstruction, + bbdmi.measure_address AS measureAddress FROM biz_business_device_measure_approval bbdma JOIN eqpt_equipment_info eei ON bbdma.sample_id = eei.id JOIN biz_business_device_measure_info bbdmi ON bbdma.data_id = bbdmi.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index 067b180..69d6c4b 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -46,7 +46,7 @@ and beit.equipment_name like concat('%',#{request.equipmentName},'%') - and beit.model = #{request.equipmentModel} + and beit.model like concat('%', #{request.equipmentModel},'%') and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index da5f329..6f7ca5b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1649,13 +1649,21 @@ if (StringUtils.isNotEmpty(measureData.getPtOne())) { BigDecimal deltaMThrowMax = ptOneDeltaMThrowMap.keySet().stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); measureData.setDeltaMThrowMax(String.valueOf(deltaMThrowMax)); - measureData.setMaxOffsetLoadPoint(ptOneDeltaMThrowMap.get(deltaMThrowMax)); + String max = ptTwoDeltaMThrowMap.get(deltaMThrowMax); + if (StringUtils.isEmpty(max)) { + max = ptTwoDeltaMThrowMap.get(deltaMThrowMax.multiply(BigDecimal.valueOf(-1))); + } + measureData.setMaxOffsetLoadPoint(max); sValue = new BigDecimal(measureData.getLoadPointASValue()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { BigDecimal deltaMThrowMax = ptTwoDeltaMThrowMap.keySet().stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); measureData.setDeltaMThrowMax(String.valueOf(deltaMThrowMax)); - measureData.setMaxOffsetLoadPoint(ptTwoDeltaMThrowMap.get(deltaMThrowMax)); - sValue = new BigDecimal(measureData.getLoadPointASValue()); + String max = ptTwoDeltaMThrowMap.get(deltaMThrowMax); + if (StringUtils.isEmpty(max)) { + max = ptTwoDeltaMThrowMap.get(deltaMThrowMax.multiply(BigDecimal.valueOf(-1))); + } + measureData.setMaxOffsetLoadPoint(max); + sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.DOWN).stripTrailingZeros(); @@ -1674,7 +1682,12 @@ BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 - BigDecimal sValue = new BigDecimal(measureData.getLoadPointASValue()); + BigDecimal sValue = BigDecimal.ZERO; + if (StringUtils.isNotEmpty(measureData.getPtOne())) { + sValue = new BigDecimal(measureData.getLoadPointASValue()); + } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { + sValue = new BigDecimal(measureData.getLoadPointBSValue()); + } BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.DOWN); BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 390f354..68d60c6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -30,7 +30,9 @@ SELECT bbdma.*, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS model, eei.manufacture_no AS manufactureNo, - bbdmi.measure_category AS measureCategory, bbdmi.create_user_name AS staffName, bbdmi.trace_date AS traceDate + bbdmi.measure_category AS measureCategory, bbdmi.create_user_name AS staffName, bbdmi.trace_date AS traceDate, + bbdmi.manufacturer AS manufacturer, bbdmi.conclusion AS conclusion, bbdmi.restriction_instruction AS restrictionInstruction, + bbdmi.measure_address AS measureAddress FROM biz_business_device_measure_approval bbdma JOIN eqpt_equipment_info eei ON bbdma.sample_id = eei.id JOIN biz_business_device_measure_info bbdmi ON bbdma.data_id = bbdmi.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index 067b180..69d6c4b 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -46,7 +46,7 @@ and beit.equipment_name like concat('%',#{request.equipmentName},'%') - and beit.model = #{request.equipmentModel} + and beit.model like concat('%', #{request.equipmentModel},'%') and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 795a09a..a797c7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -267,6 +267,10 @@ @TableField(exist = false) private String conclusion; + @ApiModelProperty(value = "限用说明(前端必传，打印需要)", dataType = "String") + @TableField(exist = false) + private String restrictionInstruction; + @ApiModelProperty(value = "检定有效日期(前端必传，打印需要)", dataType = "String") @TableField(exist = false) private String measureValidDate; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java index 6ebe22d..5d3ec05 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java @@ -276,11 +276,11 @@ @TableField("update_time") private String updateTime; - @ApiModelProperty(value = "载荷点A的s(单位固定mg，不存单位)(当计算接口检定项目为偏载误差/局部示值误差时使用，该参数在结果处理表中每行都要传)", dataType = "String") + @ApiModelProperty(value = "实验载荷Pt1的s(单位固定mg，不存单位)(当计算接口检定项目为偏载误差/局部示值误差时使用，该参数在结果处理表中每行都要传)", dataType = "String") @TableField(exist = false) private String loadPointASValue; - @ApiModelProperty(value = "载荷点A的s(单位固定mg，不存单位)(当计算接口检定项目为偏载误差误差时使用，该参数在结果处理表中每行都要传)", dataType = "String") + @ApiModelProperty(value = "实验载荷Pt2的s(单位固定mg，不存单位)(当计算接口检定项目为偏载误差误差时使用，该参数在结果处理表中每行都要传)", dataType = "String") @TableField(exist = false) private String loadPointBSValue; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java index da5f329..6f7ca5b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java @@ -1649,13 +1649,21 @@ if (StringUtils.isNotEmpty(measureData.getPtOne())) { BigDecimal deltaMThrowMax = ptOneDeltaMThrowMap.keySet().stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); measureData.setDeltaMThrowMax(String.valueOf(deltaMThrowMax)); - measureData.setMaxOffsetLoadPoint(ptOneDeltaMThrowMap.get(deltaMThrowMax)); + String max = ptTwoDeltaMThrowMap.get(deltaMThrowMax); + if (StringUtils.isEmpty(max)) { + max = ptTwoDeltaMThrowMap.get(deltaMThrowMax.multiply(BigDecimal.valueOf(-1))); + } + measureData.setMaxOffsetLoadPoint(max); sValue = new BigDecimal(measureData.getLoadPointASValue()); } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { BigDecimal deltaMThrowMax = ptTwoDeltaMThrowMap.keySet().stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); measureData.setDeltaMThrowMax(String.valueOf(deltaMThrowMax)); - measureData.setMaxOffsetLoadPoint(ptTwoDeltaMThrowMap.get(deltaMThrowMax)); - sValue = new BigDecimal(measureData.getLoadPointASValue()); + String max = ptTwoDeltaMThrowMap.get(deltaMThrowMax); + if (StringUtils.isEmpty(max)) { + max = ptTwoDeltaMThrowMap.get(deltaMThrowMax.multiply(BigDecimal.valueOf(-1))); + } + measureData.setMaxOffsetLoadPoint(max); + sValue = new BigDecimal(measureData.getLoadPointBSValue()); } //UE(单位固定mg)计算 BigDecimal URValue = sqrt(sValue.multiply(sValue).add(Ud.multiply(Ud)), 4).multiply(BigDecimal.valueOf(2)).setScale(4, RoundingMode.DOWN).stripTrailingZeros(); @@ -1674,7 +1682,12 @@ BigDecimal mReduceDeltaM = mSValue.subtract(new BigDecimal(measureData.getDeltaM())); measureData.setMReduceDeltaM(String.valueOf(mReduceDeltaM)); //US(单位固定mg)计算 - BigDecimal sValue = new BigDecimal(measureData.getLoadPointASValue()); + BigDecimal sValue = BigDecimal.ZERO; + if (StringUtils.isNotEmpty(measureData.getPtOne())) { + sValue = new BigDecimal(measureData.getLoadPointASValue()); + } else if (StringUtils.isNotEmpty(measureData.getPtTwo())) { + sValue = new BigDecimal(measureData.getLoadPointBSValue()); + } BigDecimal actualDivisionValue = new BigDecimal(measureData.getActualDivisionValue()); BigDecimal Ud = actualDivisionValue.divide(sqrt(BigDecimal.valueOf(6), 4), 4, RoundingMode.DOWN); BigDecimal mpesValue = new BigDecimal(measureData.getMpesValue()); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 390f354..68d60c6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -30,7 +30,9 @@ SELECT bbdma.*, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS model, eei.manufacture_no AS manufactureNo, - bbdmi.measure_category AS measureCategory, bbdmi.create_user_name AS staffName, bbdmi.trace_date AS traceDate + bbdmi.measure_category AS measureCategory, bbdmi.create_user_name AS staffName, bbdmi.trace_date AS traceDate, + bbdmi.manufacturer AS manufacturer, bbdmi.conclusion AS conclusion, bbdmi.restriction_instruction AS restrictionInstruction, + bbdmi.measure_address AS measureAddress FROM biz_business_device_measure_approval bbdma JOIN eqpt_equipment_info eei ON bbdma.sample_id = eei.id JOIN biz_business_device_measure_info bbdmi ON bbdma.data_id = bbdmi.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml index 067b180..69d6c4b 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckInfoMapper.xml @@ -46,7 +46,7 @@ and beit.equipment_name like concat('%',#{request.equipmentName},'%') - and beit.model = #{request.equipmentModel} + and beit.model like concat('%', #{request.equipmentModel},'%') and besci.create_user_name like concat('%',#{request.createUserName},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index 795a09a..a797c7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -267,6 +267,10 @@ @TableField(exist = false) private String conclusion; + @ApiModelProperty(value = "限用说明(前端必传，打印需要)", dataType = "String") + @TableField(exist = false) + private String restrictionInstruction; + @ApiModelProperty(value = "检定有效日期(前端必传，打印需要)", dataType = "String") @TableField(exist = false) private String measureValidDate; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java index 6ebe22d..5d3ec05 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java @@ -276,11 +276,11 @@ @TableField("update_time") private String updateTime; - @ApiModelProperty(value = "载荷点A的s(单位固定mg，不存单位)(当计算接口检定项目为偏载误差/局部示值误差时使用，该参数在结果处理表中每行都要传)", dataType = "String") + @ApiModelProperty(value = "实验载荷Pt1的s(单位固定mg，不存单位)(当计算接口检定项目为偏载误差/局部示值误差时使用，该参数在结果处理表中每行都要传)", dataType = "String") @TableField(exist = false) private String loadPointASValue; - @ApiModelProperty(value = "载荷点A的s(单位固定mg，不存单位)(当计算接口检定项目为偏载误差误差时使用，该参数在结果处理表中每行都要传)", dataType = "String") + @ApiModelProperty(value = "实验载荷Pt2的s(单位固定mg，不存单位)(当计算接口检定项目为偏载误差误差时使用，该参数在结果处理表中每行都要传)", dataType = "String") @TableField(exist = false) private String loadPointBSValue; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java index 5561e64..4a95a20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java @@ -1,5 +1,12 @@ package com.casic.missiles.model.equipment; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -12,7 +19,6 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; /** @@ -25,6 +31,11 @@ */ @Data @TableName("biz_equipment_standard_check_record_approval") +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated public class BizEquipmentStandardCheckRecordApproval extends BaseRequest implements Serializable { private static final long serialVersionUID = 1L; @@ -36,6 +47,7 @@ /** * 核查记录编号 */ + @ExcelProperty(value = "核查记录编号", order = 0) @ApiModelProperty(value = "核查记录编号", dataType = "String") @TableField("record_no") private String recordNo; @@ -43,6 +55,7 @@ /** * 核查记录名称 */ + @ExcelProperty(value = "核查记录名称", order = 1) @NotEmpty(message = "核查记录名称不能为空") @ApiModelProperty(value = "核查记录名称", dataType = "String") @TableField("record_name") @@ -99,6 +112,7 @@ @TableField("create_user_name") private String createUserName; + @ExcelProperty(value = "核查员", order = 7) @ApiModelProperty(value = "核查员", dataType = "String") @TableField(exist = false) private String checkUserName; @@ -129,22 +143,27 @@ @TableField(exist = false) private Integer decisionItem; + @ExcelProperty(value = "被核查标准装置名称", order = 2) @ApiModelProperty(value = "被核查标准装置名称(列表/详情返回参数)", dataType = "String") @TableField(exist = false) private String standardEquipmentName; + @ExcelProperty(value = "被核查设备名称", order = 3) @ApiModelProperty(value = "被核查设备名称(列表/详情返回参数)", dataType = "String") @TableField(exist = false) private String equipmentName; + @ExcelProperty(value = "被核查设备规格型号", order = 4) @ApiModelProperty(value = "被核查设备规格型号(列表/详情返回参数)", dataType = "String") @TableField(exist = false) private String equipmentModel; + @ExcelProperty(value = "核查标准设备名称", order = 5) @ApiModelProperty(value = "核查标准设备名称(列表/详情返回参数)", dataType = "String") @TableField(exist = false) private String checkEquipmentName; + @ExcelProperty(value = "核查标准设备型号", order = 6) @ApiModelProperty(value = "核查标准设备型号(列表/详情返回参数)", dataType = "String") @TableField(exist = false) private String checkEquipmentModel; @@ -155,6 +174,7 @@ @ApiModelProperty(value = "核查记录word文件名称", dataType = "String") private String checkRecordWordFile; + @ExcelProperty(value = "核查时间", order = 8) @ApiModelProperty(value = "核查日期（打印）", dataType = "String") @TableField(exist = false) private String checkDate; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/StandardEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/StandardEventPostProcessor.java index 0ea0fe0..9b6ced2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/StandardEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/StandardEventPostProcessor.java @@ -48,17 +48,18 @@ Integer approvalType = approvalInfo.getApprovalType(); String standardNo = approvalInfo.getStandardNo(); int row = 0; - if(ApprovalTypeEnum.ADD == approvalType){ + if (ApprovalTypeEnum.ADD == approvalType) { BizEquipmentStandardInfo standardInfo = ConvertUtils.sourceToTarget(approvalInfo, BizEquipmentStandardInfo.class); - standardInfo.setId(null); + //使用approvalInfo的id，保证与审批时添加的关联表数据在审批通过后能查到 +// standardInfo.setId(null); row = standardInfoMapper.insert(standardInfo); - } else if(ApprovalTypeEnum.UPDATE == approvalType){ + } else if (ApprovalTypeEnum.UPDATE == approvalType) { BizEquipmentStandardInfo info = standardInfoMapper.selectByNo(standardNo); BizEquipmentStandardInfo standardInfo = ConvertUtils.sourceToTarget(approvalInfo, BizEquipmentStandardInfo.class); standardInfo.setId(info.getId()); standardInfo.setCreateTime(null); row = standardInfoMapper.updateById(standardInfo); - } else if(ApprovalTypeEnum.DELETE == approvalType){ + } else if (ApprovalTypeEnum.DELETE == approvalType) { //不删除审批表中数据，保证删除审批流程中存在记录，保证删除的数据存在设备审批表(变相逻辑删) //standardInfoApprovalMapper.deleteById(id); row = standardInfoMapper.deleteByNo(standardNo);