diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index ee65d6f..f541e90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -43,6 +43,12 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("委托方满意度调查表详情") + @PostMapping("/detail") + public ReturnDTO questionnaireDetail(@RequestBody @Valid IdDTO idDTO) { + return questionnaireService.questionnaireDetail(idDTO.getId()); + } + @ApiOperation("未关联委托方情况报告的委托方满意度调查表列表") @PostMapping("/unrelated/listPage") public ReturnDTO> unrelatedListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index ee65d6f..f541e90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -43,6 +43,12 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("委托方满意度调查表详情") + @PostMapping("/detail") + public ReturnDTO questionnaireDetail(@RequestBody @Valid IdDTO idDTO) { + return questionnaireService.questionnaireDetail(idDTO.getId()); + } + @ApiOperation("未关联委托方情况报告的委托方满意度调查表列表") @PostMapping("/unrelated/listPage") public ReturnDTO> unrelatedListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) { 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 3c9d242..6e62c48 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 @@ -1122,7 +1122,7 @@ if (BigDecimal.ZERO.compareTo(rTp) == 0 || BigDecimal.ZERO.compareTo(dwstDt) == 0) { continue; } - BigDecimal deltaT = (rValue.divide(rTp, 4, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 4, RoundingMode.HALF_UP); + BigDecimal deltaT = (rValue.divide(rTp, 6, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 6, RoundingMode.HALF_UP); BigDecimal measureValue = rValue.subtract(deltaT.multiply(drDt)).setScale(4, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); //项目为R'(0℃)或R'(100℃)时的测量值在允差下限、允差上限范围内，才进行α、△t、△α计算，否则直接为不合格 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index ee65d6f..f541e90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -43,6 +43,12 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("委托方满意度调查表详情") + @PostMapping("/detail") + public ReturnDTO questionnaireDetail(@RequestBody @Valid IdDTO idDTO) { + return questionnaireService.questionnaireDetail(idDTO.getId()); + } + @ApiOperation("未关联委托方情况报告的委托方满意度调查表列表") @PostMapping("/unrelated/listPage") public ReturnDTO> unrelatedListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) { 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 3c9d242..6e62c48 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 @@ -1122,7 +1122,7 @@ if (BigDecimal.ZERO.compareTo(rTp) == 0 || BigDecimal.ZERO.compareTo(dwstDt) == 0) { continue; } - BigDecimal deltaT = (rValue.divide(rTp, 4, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 4, RoundingMode.HALF_UP); + BigDecimal deltaT = (rValue.divide(rTp, 6, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 6, RoundingMode.HALF_UP); BigDecimal measureValue = rValue.subtract(deltaT.multiply(drDt)).setScale(4, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); //项目为R'(0℃)或R'(100℃)时的测量值在允差下限、允差上限范围内，才进行α、△t、△α计算，否则直接为不合格 diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml index 49538fb..e8e94cd 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml @@ -20,13 +20,13 @@ - - - - - - - + + + + + + + @@ -35,9 +35,9 @@ - SELECT brfmns.*, brfmnsl.novelty_id, brfmnsl.file_id, brfmnsl.file_no, brfmnsl.file_name, brfmnsl.novelty_result + SELECT brfmns.* FROM biz_resource_file_method_novelty_search brfmns - LEFT JOIN biz_resource_file_method_novelty_search_log brfmnsl ON brfmns.id = brfmnsl.novelty_id + WHERE 1=1 and brfmns.approval_status = #{request.approvalStatus} @@ -46,7 +46,7 @@ and brfmns.create_user_id = #{request.createUserId} - and brfmnsl.novelty_result = #{request.noveltyResult} + and brfmns.novelty_result = #{request.noveltyResult} and brfmns.form_no like concat('%',#{request.formNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java index 23d6537..0d4f83f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java @@ -347,7 +347,7 @@ @TableField("r_tp") private String rTp; - @ApiModelProperty(value = "Ws，该参数在结果处理表中每行都要传", dataType = "String") + @ApiModelProperty(value = "Ws（用户页面手动计算填入（ws=R值/R*tp）），该参数在结果处理表中每行都要传", dataType = "String") @TableField("w_s") private String wS; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index ee65d6f..f541e90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -43,6 +43,12 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("委托方满意度调查表详情") + @PostMapping("/detail") + public ReturnDTO questionnaireDetail(@RequestBody @Valid IdDTO idDTO) { + return questionnaireService.questionnaireDetail(idDTO.getId()); + } + @ApiOperation("未关联委托方情况报告的委托方满意度调查表列表") @PostMapping("/unrelated/listPage") public ReturnDTO> unrelatedListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) { 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 3c9d242..6e62c48 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 @@ -1122,7 +1122,7 @@ if (BigDecimal.ZERO.compareTo(rTp) == 0 || BigDecimal.ZERO.compareTo(dwstDt) == 0) { continue; } - BigDecimal deltaT = (rValue.divide(rTp, 4, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 4, RoundingMode.HALF_UP); + BigDecimal deltaT = (rValue.divide(rTp, 6, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 6, RoundingMode.HALF_UP); BigDecimal measureValue = rValue.subtract(deltaT.multiply(drDt)).setScale(4, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); //项目为R'(0℃)或R'(100℃)时的测量值在允差下限、允差上限范围内，才进行α、△t、△α计算，否则直接为不合格 diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml index 49538fb..e8e94cd 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml @@ -20,13 +20,13 @@ - - - - - - - + + + + + + + @@ -35,9 +35,9 @@ - SELECT brfmns.*, brfmnsl.novelty_id, brfmnsl.file_id, brfmnsl.file_no, brfmnsl.file_name, brfmnsl.novelty_result + SELECT brfmns.* FROM biz_resource_file_method_novelty_search brfmns - LEFT JOIN biz_resource_file_method_novelty_search_log brfmnsl ON brfmns.id = brfmnsl.novelty_id + WHERE 1=1 and brfmns.approval_status = #{request.approvalStatus} @@ -46,7 +46,7 @@ and brfmns.create_user_id = #{request.createUserId} - and brfmnsl.novelty_result = #{request.noveltyResult} + and brfmns.novelty_result = #{request.noveltyResult} and brfmns.form_no like concat('%',#{request.formNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java index 23d6537..0d4f83f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java @@ -347,7 +347,7 @@ @TableField("r_tp") private String rTp; - @ApiModelProperty(value = "Ws，该参数在结果处理表中每行都要传", dataType = "String") + @ApiModelProperty(value = "Ws（用户页面手动计算填入（ws=R值/R*tp）），该参数在结果处理表中每行都要传", dataType = "String") @TableField("w_s") private String wS; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index c403d75..40376c1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; import com.casic.missiles.service.business.IBizBusinessDeviceMeasureApprovalService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import com.casic.missiles.utils.SpringContextUtil; @@ -89,7 +90,9 @@ }); //非已定义检定项分类时上传的原始记录和检定证书，无需再生成 if (StringUtils.isEmpty(request.getConstRecordExcelData())) { - genericEqptDataProvider.measureCertificateTask(request); + BizBusinessDeviceMeasureApproval measureApproval = ConvertUtils.sourceToTargetDeep(request, BizBusinessDeviceMeasureApproval.class); + measureApproval.setCertificateNo("{{certificateNo}}"); + genericEqptDataProvider.measureCertificateTask(measureApproval); } saveResponse = new DeviceMeasureApprovalSaveResponse(); saveResponse.setId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bda8739..2434022 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -317,8 +317,14 @@ request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); } - //更新记录 - int updateFlag = measureApprovalMapper.updateById(request); + //更新记录，保证编号不被更新为{{certificateNo}} + BizBusinessDeviceMeasureApproval approval = new BizBusinessDeviceMeasureApproval(); + approval.setId(request.getId()); + approval.setCertificateFile(request.getCertificateFile()); + approval.setCertificateWordFile(request.getCertificateWordFile()); + approval.setOriginalRecordFile(request.getOriginalRecordFile()); + approval.setOriginalRecordWordFile(request.getOriginalRecordWordFile()); + int updateFlag = measureApprovalMapper.updateById(approval); log.debug("----------------update flag {}", updateFlag); Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index ee65d6f..f541e90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -43,6 +43,12 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("委托方满意度调查表详情") + @PostMapping("/detail") + public ReturnDTO questionnaireDetail(@RequestBody @Valid IdDTO idDTO) { + return questionnaireService.questionnaireDetail(idDTO.getId()); + } + @ApiOperation("未关联委托方情况报告的委托方满意度调查表列表") @PostMapping("/unrelated/listPage") public ReturnDTO> unrelatedListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) { 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 3c9d242..6e62c48 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 @@ -1122,7 +1122,7 @@ if (BigDecimal.ZERO.compareTo(rTp) == 0 || BigDecimal.ZERO.compareTo(dwstDt) == 0) { continue; } - BigDecimal deltaT = (rValue.divide(rTp, 4, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 4, RoundingMode.HALF_UP); + BigDecimal deltaT = (rValue.divide(rTp, 6, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 6, RoundingMode.HALF_UP); BigDecimal measureValue = rValue.subtract(deltaT.multiply(drDt)).setScale(4, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); //项目为R'(0℃)或R'(100℃)时的测量值在允差下限、允差上限范围内，才进行α、△t、△α计算，否则直接为不合格 diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml index 49538fb..e8e94cd 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml @@ -20,13 +20,13 @@ - - - - - - - + + + + + + + @@ -35,9 +35,9 @@ - SELECT brfmns.*, brfmnsl.novelty_id, brfmnsl.file_id, brfmnsl.file_no, brfmnsl.file_name, brfmnsl.novelty_result + SELECT brfmns.* FROM biz_resource_file_method_novelty_search brfmns - LEFT JOIN biz_resource_file_method_novelty_search_log brfmnsl ON brfmns.id = brfmnsl.novelty_id + WHERE 1=1 and brfmns.approval_status = #{request.approvalStatus} @@ -46,7 +46,7 @@ and brfmns.create_user_id = #{request.createUserId} - and brfmnsl.novelty_result = #{request.noveltyResult} + and brfmns.novelty_result = #{request.noveltyResult} and brfmns.form_no like concat('%',#{request.formNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java index 23d6537..0d4f83f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java @@ -347,7 +347,7 @@ @TableField("r_tp") private String rTp; - @ApiModelProperty(value = "Ws，该参数在结果处理表中每行都要传", dataType = "String") + @ApiModelProperty(value = "Ws（用户页面手动计算填入（ws=R值/R*tp）），该参数在结果处理表中每行都要传", dataType = "String") @TableField("w_s") private String wS; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index c403d75..40376c1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; import com.casic.missiles.service.business.IBizBusinessDeviceMeasureApprovalService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import com.casic.missiles.utils.SpringContextUtil; @@ -89,7 +90,9 @@ }); //非已定义检定项分类时上传的原始记录和检定证书，无需再生成 if (StringUtils.isEmpty(request.getConstRecordExcelData())) { - genericEqptDataProvider.measureCertificateTask(request); + BizBusinessDeviceMeasureApproval measureApproval = ConvertUtils.sourceToTargetDeep(request, BizBusinessDeviceMeasureApproval.class); + measureApproval.setCertificateNo("{{certificateNo}}"); + genericEqptDataProvider.measureCertificateTask(measureApproval); } saveResponse = new DeviceMeasureApprovalSaveResponse(); saveResponse.setId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bda8739..2434022 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -317,8 +317,14 @@ request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); } - //更新记录 - int updateFlag = measureApprovalMapper.updateById(request); + //更新记录，保证编号不被更新为{{certificateNo}} + BizBusinessDeviceMeasureApproval approval = new BizBusinessDeviceMeasureApproval(); + approval.setId(request.getId()); + approval.setCertificateFile(request.getCertificateFile()); + approval.setCertificateWordFile(request.getCertificateWordFile()); + approval.setOriginalRecordFile(request.getOriginalRecordFile()); + approval.setOriginalRecordWordFile(request.getOriginalRecordWordFile()); + int updateFlag = measureApprovalMapper.updateById(approval); log.debug("----------------update flag {}", updateFlag); Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 22c949f..407c2fb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -117,39 +117,24 @@ map.put("title", "校验结果"); break; } - //技术文件处理 + //技术文件换行展示处理 if (map.containsKey("technologyFile") && ObjectUtils.isNotEmpty(map.get("technologyFile"))) { //技术文件用逗号隔开 String technologyFiles = ((String) map.get("technologyFile")); StringBuilder fileName = new StringBuilder(); - if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains("[")) { - //替换[]、""和\ - technologyFiles = technologyFiles.replaceFirst("^\\[", "").replaceFirst("]$", "").replaceAll("\"([^\"]*)\"", "$1"); + if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains(",")) { String[] fileNames = technologyFiles.split(","); for (int i = 0; i < fileNames.length; i++) { String file = fileNames[i]; - String[] s = file.split("[_.]"); - //如果全部是数字并且长度为13位则放进替换列表 - List list = new ArrayList<>(); - for (String part : s) { - if (part.chars().allMatch(Character::isDigit) && part.length() == 13) { - list.add("_" + part); - } - } - for (String part : list) { - file = file.replaceAll(part, ""); - } - file = file.replace(".$", ""); - //截取文件后缀 - int lastDotIndex = file.lastIndexOf("."); - String[] split = file.split("\\."); - String suffix = split[split.length - 1]; - List suffixList = Arrays.asList("docx", "doc", "xls", "xlsx", "pdf", "ppt", "txt", "jpg", "png", "jpeg", "gif", "bmp"); - if (lastDotIndex != -1 && suffixList.contains(suffix)) { - file = file.substring(0, lastDotIndex); + String[] fileArr = file.split("_"); + if (fileArr.length > 1) { + file = fileArr[0]; } fileName.append(file).append(i < fileNames.length - 1 ? "\r\n" : ""); } + } else if (StringUtils.isNotEmpty(technologyFiles)) { + String[] split = technologyFiles.split("\\."); + fileName.append(split[0]); } else { fileName.append(technologyFiles); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index e1f3ae8..ee990e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -191,6 +191,8 @@ } if (StringUtils.isNotEmpty(safety.getFrequency()) && !"/".equals(safety.getFrequency())) { safety.setFrequency(safety.getFrequency() + safety.getFrequencyUnit()); + } else if (StringUtils.isEmpty(safety.getFrequency())) { + safety.setFrequency("/"); } safety.applyStrategyBasedOnDataType(itemCategoryName); safetyList.add(safety); @@ -281,6 +283,11 @@ } safety.setUnit(safety.getCapacity() + "/" + safety.getUnit()); } + if (StringUtils.isNotEmpty(safety.getFrequency()) && !"/".equals(safety.getFrequency())) { + safety.setFrequency(safety.getFrequency() + safety.getFrequencyUnit()); + } else if (StringUtils.isEmpty(safety.getFrequency())) { + safety.setFrequency("/"); + } safety.applyStrategyBasedOnDataType(measureApproval.getItemCategoryName()); safetyList.add(safety); } @@ -521,22 +528,26 @@ // map.put("vsec", vsec + vsecUnit); if (measureDataMap.containsKey("ACI") && CollectionUtils.isNotEmpty(measureDataMap.get("ACI"))) { map.put("frequency1", measureDataMap.get("ACI").get(0).getFrequency()); - map.put("frequencyUnit1", measureDataMap.get("ACI").get(0).getFrequencyUnit()); - map.put("unit1", measureDataMap.get("ACI").get(0).getUnit()); + //map.put("frequencyUnit1", measureDataMap.get("ACI").get(0).getFrequencyUnit()); + //map.put("unit1", measureDataMap.get("ACI").get(0).getUnit()); + map.put("unit1", "A"); map.put("measureDataCalibratorListI", measureDataMap.get("ACI")); } if (measureDataMap.containsKey("ACV") && CollectionUtils.isNotEmpty(measureDataMap.get("ACV"))) { map.put("frequency2", measureDataMap.get("ACV").get(0).getFrequency()); - map.put("frequencyUnit2", measureDataMap.get("ACV").get(0).getFrequencyUnit()); - map.put("unit2", measureDataMap.get("ACV").get(0).getUnit()); + //map.put("frequencyUnit2", measureDataMap.get("ACV").get(0).getFrequencyUnit()); + //map.put("unit2", measureDataMap.get("ACV").get(0).getUnit()); + map.put("unit2", "V"); map.put("measureDataCalibratorListV", measureDataMap.get("ACV")); } if (measureDataMap.containsKey("DCI") && CollectionUtils.isNotEmpty(measureDataMap.get("DCI"))) { - map.put("unit3", measureDataMap.get("DCI").get(0).getUnit()); + //map.put("unit3", measureDataMap.get("DCI").get(0).getUnit()); + map.put("unit3", "A"); map.put("DCIListI", measureDataMap.get("DCI")); } if (measureDataMap.containsKey("DCV") && CollectionUtils.isNotEmpty(measureDataMap.get("DCV"))) { - map.put("unit4", measureDataMap.get("DCV").get(0).getUnit()); + //map.put("unit4", measureDataMap.get("DCV").get(0).getUnit()); + map.put("unit4", "V"); map.put("DCVListV", measureDataMap.get("DCV")); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index ee65d6f..f541e90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -43,6 +43,12 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("委托方满意度调查表详情") + @PostMapping("/detail") + public ReturnDTO questionnaireDetail(@RequestBody @Valid IdDTO idDTO) { + return questionnaireService.questionnaireDetail(idDTO.getId()); + } + @ApiOperation("未关联委托方情况报告的委托方满意度调查表列表") @PostMapping("/unrelated/listPage") public ReturnDTO> unrelatedListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) { 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 3c9d242..6e62c48 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 @@ -1122,7 +1122,7 @@ if (BigDecimal.ZERO.compareTo(rTp) == 0 || BigDecimal.ZERO.compareTo(dwstDt) == 0) { continue; } - BigDecimal deltaT = (rValue.divide(rTp, 4, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 4, RoundingMode.HALF_UP); + BigDecimal deltaT = (rValue.divide(rTp, 6, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 6, RoundingMode.HALF_UP); BigDecimal measureValue = rValue.subtract(deltaT.multiply(drDt)).setScale(4, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); //项目为R'(0℃)或R'(100℃)时的测量值在允差下限、允差上限范围内，才进行α、△t、△α计算，否则直接为不合格 diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml index 49538fb..e8e94cd 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml @@ -20,13 +20,13 @@ - - - - - - - + + + + + + + @@ -35,9 +35,9 @@ - SELECT brfmns.*, brfmnsl.novelty_id, brfmnsl.file_id, brfmnsl.file_no, brfmnsl.file_name, brfmnsl.novelty_result + SELECT brfmns.* FROM biz_resource_file_method_novelty_search brfmns - LEFT JOIN biz_resource_file_method_novelty_search_log brfmnsl ON brfmns.id = brfmnsl.novelty_id + WHERE 1=1 and brfmns.approval_status = #{request.approvalStatus} @@ -46,7 +46,7 @@ and brfmns.create_user_id = #{request.createUserId} - and brfmnsl.novelty_result = #{request.noveltyResult} + and brfmns.novelty_result = #{request.noveltyResult} and brfmns.form_no like concat('%',#{request.formNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java index 23d6537..0d4f83f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java @@ -347,7 +347,7 @@ @TableField("r_tp") private String rTp; - @ApiModelProperty(value = "Ws，该参数在结果处理表中每行都要传", dataType = "String") + @ApiModelProperty(value = "Ws（用户页面手动计算填入（ws=R值/R*tp）），该参数在结果处理表中每行都要传", dataType = "String") @TableField("w_s") private String wS; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index c403d75..40376c1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; import com.casic.missiles.service.business.IBizBusinessDeviceMeasureApprovalService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import com.casic.missiles.utils.SpringContextUtil; @@ -89,7 +90,9 @@ }); //非已定义检定项分类时上传的原始记录和检定证书，无需再生成 if (StringUtils.isEmpty(request.getConstRecordExcelData())) { - genericEqptDataProvider.measureCertificateTask(request); + BizBusinessDeviceMeasureApproval measureApproval = ConvertUtils.sourceToTargetDeep(request, BizBusinessDeviceMeasureApproval.class); + measureApproval.setCertificateNo("{{certificateNo}}"); + genericEqptDataProvider.measureCertificateTask(measureApproval); } saveResponse = new DeviceMeasureApprovalSaveResponse(); saveResponse.setId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bda8739..2434022 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -317,8 +317,14 @@ request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); } - //更新记录 - int updateFlag = measureApprovalMapper.updateById(request); + //更新记录，保证编号不被更新为{{certificateNo}} + BizBusinessDeviceMeasureApproval approval = new BizBusinessDeviceMeasureApproval(); + approval.setId(request.getId()); + approval.setCertificateFile(request.getCertificateFile()); + approval.setCertificateWordFile(request.getCertificateWordFile()); + approval.setOriginalRecordFile(request.getOriginalRecordFile()); + approval.setOriginalRecordWordFile(request.getOriginalRecordWordFile()); + int updateFlag = measureApprovalMapper.updateById(approval); log.debug("----------------update flag {}", updateFlag); Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 22c949f..407c2fb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -117,39 +117,24 @@ map.put("title", "校验结果"); break; } - //技术文件处理 + //技术文件换行展示处理 if (map.containsKey("technologyFile") && ObjectUtils.isNotEmpty(map.get("technologyFile"))) { //技术文件用逗号隔开 String technologyFiles = ((String) map.get("technologyFile")); StringBuilder fileName = new StringBuilder(); - if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains("[")) { - //替换[]、""和\ - technologyFiles = technologyFiles.replaceFirst("^\\[", "").replaceFirst("]$", "").replaceAll("\"([^\"]*)\"", "$1"); + if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains(",")) { String[] fileNames = technologyFiles.split(","); for (int i = 0; i < fileNames.length; i++) { String file = fileNames[i]; - String[] s = file.split("[_.]"); - //如果全部是数字并且长度为13位则放进替换列表 - List list = new ArrayList<>(); - for (String part : s) { - if (part.chars().allMatch(Character::isDigit) && part.length() == 13) { - list.add("_" + part); - } - } - for (String part : list) { - file = file.replaceAll(part, ""); - } - file = file.replace(".$", ""); - //截取文件后缀 - int lastDotIndex = file.lastIndexOf("."); - String[] split = file.split("\\."); - String suffix = split[split.length - 1]; - List suffixList = Arrays.asList("docx", "doc", "xls", "xlsx", "pdf", "ppt", "txt", "jpg", "png", "jpeg", "gif", "bmp"); - if (lastDotIndex != -1 && suffixList.contains(suffix)) { - file = file.substring(0, lastDotIndex); + String[] fileArr = file.split("_"); + if (fileArr.length > 1) { + file = fileArr[0]; } fileName.append(file).append(i < fileNames.length - 1 ? "\r\n" : ""); } + } else if (StringUtils.isNotEmpty(technologyFiles)) { + String[] split = technologyFiles.split("\\."); + fileName.append(split[0]); } else { fileName.append(technologyFiles); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index e1f3ae8..ee990e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -191,6 +191,8 @@ } if (StringUtils.isNotEmpty(safety.getFrequency()) && !"/".equals(safety.getFrequency())) { safety.setFrequency(safety.getFrequency() + safety.getFrequencyUnit()); + } else if (StringUtils.isEmpty(safety.getFrequency())) { + safety.setFrequency("/"); } safety.applyStrategyBasedOnDataType(itemCategoryName); safetyList.add(safety); @@ -281,6 +283,11 @@ } safety.setUnit(safety.getCapacity() + "/" + safety.getUnit()); } + if (StringUtils.isNotEmpty(safety.getFrequency()) && !"/".equals(safety.getFrequency())) { + safety.setFrequency(safety.getFrequency() + safety.getFrequencyUnit()); + } else if (StringUtils.isEmpty(safety.getFrequency())) { + safety.setFrequency("/"); + } safety.applyStrategyBasedOnDataType(measureApproval.getItemCategoryName()); safetyList.add(safety); } @@ -521,22 +528,26 @@ // map.put("vsec", vsec + vsecUnit); if (measureDataMap.containsKey("ACI") && CollectionUtils.isNotEmpty(measureDataMap.get("ACI"))) { map.put("frequency1", measureDataMap.get("ACI").get(0).getFrequency()); - map.put("frequencyUnit1", measureDataMap.get("ACI").get(0).getFrequencyUnit()); - map.put("unit1", measureDataMap.get("ACI").get(0).getUnit()); + //map.put("frequencyUnit1", measureDataMap.get("ACI").get(0).getFrequencyUnit()); + //map.put("unit1", measureDataMap.get("ACI").get(0).getUnit()); + map.put("unit1", "A"); map.put("measureDataCalibratorListI", measureDataMap.get("ACI")); } if (measureDataMap.containsKey("ACV") && CollectionUtils.isNotEmpty(measureDataMap.get("ACV"))) { map.put("frequency2", measureDataMap.get("ACV").get(0).getFrequency()); - map.put("frequencyUnit2", measureDataMap.get("ACV").get(0).getFrequencyUnit()); - map.put("unit2", measureDataMap.get("ACV").get(0).getUnit()); + //map.put("frequencyUnit2", measureDataMap.get("ACV").get(0).getFrequencyUnit()); + //map.put("unit2", measureDataMap.get("ACV").get(0).getUnit()); + map.put("unit2", "V"); map.put("measureDataCalibratorListV", measureDataMap.get("ACV")); } if (measureDataMap.containsKey("DCI") && CollectionUtils.isNotEmpty(measureDataMap.get("DCI"))) { - map.put("unit3", measureDataMap.get("DCI").get(0).getUnit()); + //map.put("unit3", measureDataMap.get("DCI").get(0).getUnit()); + map.put("unit3", "A"); map.put("DCIListI", measureDataMap.get("DCI")); } if (measureDataMap.containsKey("DCV") && CollectionUtils.isNotEmpty(measureDataMap.get("DCV"))) { - map.put("unit4", measureDataMap.get("DCV").get(0).getUnit()); + //map.put("unit4", measureDataMap.get("DCV").get(0).getUnit()); + map.put("unit4", "V"); map.put("DCVListV", measureDataMap.get("DCV")); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index a93d287..63b1b58 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -457,7 +457,7 @@ if (StringUtils.isEmpty(measureItemInfo.getAppearance())) { addDataRemoveItem(dataItems, -1, "外观"); } else { - map.put("firstSeq", indexList.get(titleIndex++)); + map.put("firstSeq", indexList.get(titleIndex++) + "、"); } //如果是功能校准源，则进行一下删除 switch (measureItemInfo.getItemCategoryName()) { @@ -467,7 +467,7 @@ if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "setPointGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "设定点偏差"); checkRemoveList(indexList, "setPointList", map, null, titleIndex, dataItems, 6, "otherOutcome"); @@ -477,12 +477,12 @@ if (StringUtils.isEmpty(measureItemInfo.getTightness())) { addDataRemoveItem(dataItems, -1, "密封性"); } else { - map.put("secondSeq", indexList.get(titleIndex++)); + map.put("secondSeq", indexList.get(titleIndex++) + "、"); } if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "检定数据"); checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "数据处理"); @@ -491,12 +491,12 @@ if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("secondSeq", indexList.get(titleIndex++)); + map.put("secondSeq", indexList.get(titleIndex++) + "、"); } if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 4, "零点漂移"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "示值误差"); checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 6, "{{outcome}}"); @@ -505,12 +505,12 @@ if (StringUtils.isEmpty(measureItemInfo.getTightness())) { addDataRemoveItem(dataItems, -1, "密封性"); } else { - map.put("secondSeq", indexList.get(titleIndex++)); + map.put("secondSeq", indexList.get(titleIndex++) + "、"); } if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "回程误差"); checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 4, "outcome"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java index e0b1bd9..8a12d62 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java @@ -78,6 +78,12 @@ } @Override + public ReturnDTO questionnaireDetail(Long id) { + BizResourceCustomerQuestionnaire questionnaire = questionnaireMapper.selectById(id); + return ReturnUtil.success(questionnaire); + } + + @Override public Page unrelatedListPage(Page page, CustomerQuestionnaireListRequest request) { Page questionnairePage = questionnaireMapper.selectUnrelatedListPage(page, request); return questionnairePage; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index ee65d6f..f541e90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -43,6 +43,12 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("委托方满意度调查表详情") + @PostMapping("/detail") + public ReturnDTO questionnaireDetail(@RequestBody @Valid IdDTO idDTO) { + return questionnaireService.questionnaireDetail(idDTO.getId()); + } + @ApiOperation("未关联委托方情况报告的委托方满意度调查表列表") @PostMapping("/unrelated/listPage") public ReturnDTO> unrelatedListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) { 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 3c9d242..6e62c48 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 @@ -1122,7 +1122,7 @@ if (BigDecimal.ZERO.compareTo(rTp) == 0 || BigDecimal.ZERO.compareTo(dwstDt) == 0) { continue; } - BigDecimal deltaT = (rValue.divide(rTp, 4, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 4, RoundingMode.HALF_UP); + BigDecimal deltaT = (rValue.divide(rTp, 6, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 6, RoundingMode.HALF_UP); BigDecimal measureValue = rValue.subtract(deltaT.multiply(drDt)).setScale(4, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); //项目为R'(0℃)或R'(100℃)时的测量值在允差下限、允差上限范围内，才进行α、△t、△α计算，否则直接为不合格 diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml index 49538fb..e8e94cd 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml @@ -20,13 +20,13 @@ - - - - - - - + + + + + + + @@ -35,9 +35,9 @@ - SELECT brfmns.*, brfmnsl.novelty_id, brfmnsl.file_id, brfmnsl.file_no, brfmnsl.file_name, brfmnsl.novelty_result + SELECT brfmns.* FROM biz_resource_file_method_novelty_search brfmns - LEFT JOIN biz_resource_file_method_novelty_search_log brfmnsl ON brfmns.id = brfmnsl.novelty_id + WHERE 1=1 and brfmns.approval_status = #{request.approvalStatus} @@ -46,7 +46,7 @@ and brfmns.create_user_id = #{request.createUserId} - and brfmnsl.novelty_result = #{request.noveltyResult} + and brfmns.novelty_result = #{request.noveltyResult} and brfmns.form_no like concat('%',#{request.formNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java index 23d6537..0d4f83f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java @@ -347,7 +347,7 @@ @TableField("r_tp") private String rTp; - @ApiModelProperty(value = "Ws，该参数在结果处理表中每行都要传", dataType = "String") + @ApiModelProperty(value = "Ws（用户页面手动计算填入（ws=R值/R*tp）），该参数在结果处理表中每行都要传", dataType = "String") @TableField("w_s") private String wS; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index c403d75..40376c1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; import com.casic.missiles.service.business.IBizBusinessDeviceMeasureApprovalService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import com.casic.missiles.utils.SpringContextUtil; @@ -89,7 +90,9 @@ }); //非已定义检定项分类时上传的原始记录和检定证书，无需再生成 if (StringUtils.isEmpty(request.getConstRecordExcelData())) { - genericEqptDataProvider.measureCertificateTask(request); + BizBusinessDeviceMeasureApproval measureApproval = ConvertUtils.sourceToTargetDeep(request, BizBusinessDeviceMeasureApproval.class); + measureApproval.setCertificateNo("{{certificateNo}}"); + genericEqptDataProvider.measureCertificateTask(measureApproval); } saveResponse = new DeviceMeasureApprovalSaveResponse(); saveResponse.setId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bda8739..2434022 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -317,8 +317,14 @@ request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); } - //更新记录 - int updateFlag = measureApprovalMapper.updateById(request); + //更新记录，保证编号不被更新为{{certificateNo}} + BizBusinessDeviceMeasureApproval approval = new BizBusinessDeviceMeasureApproval(); + approval.setId(request.getId()); + approval.setCertificateFile(request.getCertificateFile()); + approval.setCertificateWordFile(request.getCertificateWordFile()); + approval.setOriginalRecordFile(request.getOriginalRecordFile()); + approval.setOriginalRecordWordFile(request.getOriginalRecordWordFile()); + int updateFlag = measureApprovalMapper.updateById(approval); log.debug("----------------update flag {}", updateFlag); Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 22c949f..407c2fb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -117,39 +117,24 @@ map.put("title", "校验结果"); break; } - //技术文件处理 + //技术文件换行展示处理 if (map.containsKey("technologyFile") && ObjectUtils.isNotEmpty(map.get("technologyFile"))) { //技术文件用逗号隔开 String technologyFiles = ((String) map.get("technologyFile")); StringBuilder fileName = new StringBuilder(); - if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains("[")) { - //替换[]、""和\ - technologyFiles = technologyFiles.replaceFirst("^\\[", "").replaceFirst("]$", "").replaceAll("\"([^\"]*)\"", "$1"); + if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains(",")) { String[] fileNames = technologyFiles.split(","); for (int i = 0; i < fileNames.length; i++) { String file = fileNames[i]; - String[] s = file.split("[_.]"); - //如果全部是数字并且长度为13位则放进替换列表 - List list = new ArrayList<>(); - for (String part : s) { - if (part.chars().allMatch(Character::isDigit) && part.length() == 13) { - list.add("_" + part); - } - } - for (String part : list) { - file = file.replaceAll(part, ""); - } - file = file.replace(".$", ""); - //截取文件后缀 - int lastDotIndex = file.lastIndexOf("."); - String[] split = file.split("\\."); - String suffix = split[split.length - 1]; - List suffixList = Arrays.asList("docx", "doc", "xls", "xlsx", "pdf", "ppt", "txt", "jpg", "png", "jpeg", "gif", "bmp"); - if (lastDotIndex != -1 && suffixList.contains(suffix)) { - file = file.substring(0, lastDotIndex); + String[] fileArr = file.split("_"); + if (fileArr.length > 1) { + file = fileArr[0]; } fileName.append(file).append(i < fileNames.length - 1 ? "\r\n" : ""); } + } else if (StringUtils.isNotEmpty(technologyFiles)) { + String[] split = technologyFiles.split("\\."); + fileName.append(split[0]); } else { fileName.append(technologyFiles); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index e1f3ae8..ee990e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -191,6 +191,8 @@ } if (StringUtils.isNotEmpty(safety.getFrequency()) && !"/".equals(safety.getFrequency())) { safety.setFrequency(safety.getFrequency() + safety.getFrequencyUnit()); + } else if (StringUtils.isEmpty(safety.getFrequency())) { + safety.setFrequency("/"); } safety.applyStrategyBasedOnDataType(itemCategoryName); safetyList.add(safety); @@ -281,6 +283,11 @@ } safety.setUnit(safety.getCapacity() + "/" + safety.getUnit()); } + if (StringUtils.isNotEmpty(safety.getFrequency()) && !"/".equals(safety.getFrequency())) { + safety.setFrequency(safety.getFrequency() + safety.getFrequencyUnit()); + } else if (StringUtils.isEmpty(safety.getFrequency())) { + safety.setFrequency("/"); + } safety.applyStrategyBasedOnDataType(measureApproval.getItemCategoryName()); safetyList.add(safety); } @@ -521,22 +528,26 @@ // map.put("vsec", vsec + vsecUnit); if (measureDataMap.containsKey("ACI") && CollectionUtils.isNotEmpty(measureDataMap.get("ACI"))) { map.put("frequency1", measureDataMap.get("ACI").get(0).getFrequency()); - map.put("frequencyUnit1", measureDataMap.get("ACI").get(0).getFrequencyUnit()); - map.put("unit1", measureDataMap.get("ACI").get(0).getUnit()); + //map.put("frequencyUnit1", measureDataMap.get("ACI").get(0).getFrequencyUnit()); + //map.put("unit1", measureDataMap.get("ACI").get(0).getUnit()); + map.put("unit1", "A"); map.put("measureDataCalibratorListI", measureDataMap.get("ACI")); } if (measureDataMap.containsKey("ACV") && CollectionUtils.isNotEmpty(measureDataMap.get("ACV"))) { map.put("frequency2", measureDataMap.get("ACV").get(0).getFrequency()); - map.put("frequencyUnit2", measureDataMap.get("ACV").get(0).getFrequencyUnit()); - map.put("unit2", measureDataMap.get("ACV").get(0).getUnit()); + //map.put("frequencyUnit2", measureDataMap.get("ACV").get(0).getFrequencyUnit()); + //map.put("unit2", measureDataMap.get("ACV").get(0).getUnit()); + map.put("unit2", "V"); map.put("measureDataCalibratorListV", measureDataMap.get("ACV")); } if (measureDataMap.containsKey("DCI") && CollectionUtils.isNotEmpty(measureDataMap.get("DCI"))) { - map.put("unit3", measureDataMap.get("DCI").get(0).getUnit()); + //map.put("unit3", measureDataMap.get("DCI").get(0).getUnit()); + map.put("unit3", "A"); map.put("DCIListI", measureDataMap.get("DCI")); } if (measureDataMap.containsKey("DCV") && CollectionUtils.isNotEmpty(measureDataMap.get("DCV"))) { - map.put("unit4", measureDataMap.get("DCV").get(0).getUnit()); + //map.put("unit4", measureDataMap.get("DCV").get(0).getUnit()); + map.put("unit4", "V"); map.put("DCVListV", measureDataMap.get("DCV")); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index a93d287..63b1b58 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -457,7 +457,7 @@ if (StringUtils.isEmpty(measureItemInfo.getAppearance())) { addDataRemoveItem(dataItems, -1, "外观"); } else { - map.put("firstSeq", indexList.get(titleIndex++)); + map.put("firstSeq", indexList.get(titleIndex++) + "、"); } //如果是功能校准源，则进行一下删除 switch (measureItemInfo.getItemCategoryName()) { @@ -467,7 +467,7 @@ if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "setPointGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "设定点偏差"); checkRemoveList(indexList, "setPointList", map, null, titleIndex, dataItems, 6, "otherOutcome"); @@ -477,12 +477,12 @@ if (StringUtils.isEmpty(measureItemInfo.getTightness())) { addDataRemoveItem(dataItems, -1, "密封性"); } else { - map.put("secondSeq", indexList.get(titleIndex++)); + map.put("secondSeq", indexList.get(titleIndex++) + "、"); } if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "检定数据"); checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "数据处理"); @@ -491,12 +491,12 @@ if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("secondSeq", indexList.get(titleIndex++)); + map.put("secondSeq", indexList.get(titleIndex++) + "、"); } if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 4, "零点漂移"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "示值误差"); checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 6, "{{outcome}}"); @@ -505,12 +505,12 @@ if (StringUtils.isEmpty(measureItemInfo.getTightness())) { addDataRemoveItem(dataItems, -1, "密封性"); } else { - map.put("secondSeq", indexList.get(titleIndex++)); + map.put("secondSeq", indexList.get(titleIndex++) + "、"); } if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "回程误差"); checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 4, "outcome"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java index e0b1bd9..8a12d62 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java @@ -78,6 +78,12 @@ } @Override + public ReturnDTO questionnaireDetail(Long id) { + BizResourceCustomerQuestionnaire questionnaire = questionnaireMapper.selectById(id); + return ReturnUtil.success(questionnaire); + } + + @Override public Page unrelatedListPage(Page page, CustomerQuestionnaireListRequest request) { Page questionnairePage = questionnaireMapper.selectUnrelatedListPage(page, request); return questionnairePage; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 8b785ba..3a91bb3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -114,10 +114,12 @@ for (BizResourceFileMethodNoveltySearchLog log : list) { //实验室和组别填充 BizResourceTechniqueFile techniqueFile = techniqueFileMapper.selectById(log.getFileId()); - log.setLabCode(techniqueFile.getLabCode()); - log.setGroupCode(techniqueFile.getGroupCode()); - log.setNoveltyStatus(techniqueFile.getNoveltyStatus()); - log.setLatestNoveltyDate(techniqueFile.getLatestNoveltyDate()); + if (Objects.nonNull(techniqueFile)) { + log.setLabCode(techniqueFile.getLabCode()); + log.setGroupCode(techniqueFile.getGroupCode()); + log.setNoveltyStatus(techniqueFile.getNoveltyStatus()); + log.setLatestNoveltyDate(techniqueFile.getLatestNoveltyDate()); + } DictCodeUtils.convertDictCodeToName(log); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodConfirmEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodConfirmEventPostProcessor.java index 6cef39b..2296294 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodConfirmEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodConfirmEventPostProcessor.java @@ -2,6 +2,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -79,8 +80,10 @@ updateWrapper.eq("novelty_id", confirm.getNoveltyId()); updateWrapper.eq("file_id", confirm.getFileId()); noveltySearchLogMapper.update(noveltySearchLog, updateWrapper); - //将历史文件保存到文件作废登记表草稿箱 - + //更新另一方进度条第相关节点（更新全部方法id关联的记录，保证要更新的那条被更新，其余的也更新了不重要） + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.eq("file_id", confirm.getFileId()); + noveltySearchLogMapper.update(noveltySearchLog, wrapper1); } doHandleApprovalMessage(confirm.getCreateUserId(), confirm.getProcessId(), ApplyFromIdEnum.FILE_METHOD_CONFIRM_APPROVAL.getCode(), diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index ee65d6f..f541e90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -43,6 +43,12 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("委托方满意度调查表详情") + @PostMapping("/detail") + public ReturnDTO questionnaireDetail(@RequestBody @Valid IdDTO idDTO) { + return questionnaireService.questionnaireDetail(idDTO.getId()); + } + @ApiOperation("未关联委托方情况报告的委托方满意度调查表列表") @PostMapping("/unrelated/listPage") public ReturnDTO> unrelatedListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) { 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 3c9d242..6e62c48 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 @@ -1122,7 +1122,7 @@ if (BigDecimal.ZERO.compareTo(rTp) == 0 || BigDecimal.ZERO.compareTo(dwstDt) == 0) { continue; } - BigDecimal deltaT = (rValue.divide(rTp, 4, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 4, RoundingMode.HALF_UP); + BigDecimal deltaT = (rValue.divide(rTp, 6, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 6, RoundingMode.HALF_UP); BigDecimal measureValue = rValue.subtract(deltaT.multiply(drDt)).setScale(4, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); //项目为R'(0℃)或R'(100℃)时的测量值在允差下限、允差上限范围内，才进行α、△t、△α计算，否则直接为不合格 diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml index 49538fb..e8e94cd 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml @@ -20,13 +20,13 @@ - - - - - - - + + + + + + + @@ -35,9 +35,9 @@ - SELECT brfmns.*, brfmnsl.novelty_id, brfmnsl.file_id, brfmnsl.file_no, brfmnsl.file_name, brfmnsl.novelty_result + SELECT brfmns.* FROM biz_resource_file_method_novelty_search brfmns - LEFT JOIN biz_resource_file_method_novelty_search_log brfmnsl ON brfmns.id = brfmnsl.novelty_id + WHERE 1=1 and brfmns.approval_status = #{request.approvalStatus} @@ -46,7 +46,7 @@ and brfmns.create_user_id = #{request.createUserId} - and brfmnsl.novelty_result = #{request.noveltyResult} + and brfmns.novelty_result = #{request.noveltyResult} and brfmns.form_no like concat('%',#{request.formNo},'%') diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java index 23d6537..0d4f83f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataResistanceThermometer.java @@ -347,7 +347,7 @@ @TableField("r_tp") private String rTp; - @ApiModelProperty(value = "Ws，该参数在结果处理表中每行都要传", dataType = "String") + @ApiModelProperty(value = "Ws（用户页面手动计算填入（ws=R值/R*tp）），该参数在结果处理表中每行都要传", dataType = "String") @TableField("w_s") private String wS; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index c403d75..40376c1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.service.Impl.eqpt.GenericEqptDataProvider; import com.casic.missiles.service.business.IBizBusinessDeviceMeasureApprovalService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; +import com.casic.missiles.utils.ConvertUtils; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import com.casic.missiles.utils.SpringContextUtil; @@ -89,7 +90,9 @@ }); //非已定义检定项分类时上传的原始记录和检定证书，无需再生成 if (StringUtils.isEmpty(request.getConstRecordExcelData())) { - genericEqptDataProvider.measureCertificateTask(request); + BizBusinessDeviceMeasureApproval measureApproval = ConvertUtils.sourceToTargetDeep(request, BizBusinessDeviceMeasureApproval.class); + measureApproval.setCertificateNo("{{certificateNo}}"); + genericEqptDataProvider.measureCertificateTask(measureApproval); } saveResponse = new DeviceMeasureApprovalSaveResponse(); saveResponse.setId(request.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bda8739..2434022 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -317,8 +317,14 @@ request.setOriginalRecordFile(originalRecordFileUrl.size() > 1 ? originalRecordFileUrl.get(1) : ""); request.setOriginalRecordWordFile(originalRecordFileUrl.get(0)); } - //更新记录 - int updateFlag = measureApprovalMapper.updateById(request); + //更新记录，保证编号不被更新为{{certificateNo}} + BizBusinessDeviceMeasureApproval approval = new BizBusinessDeviceMeasureApproval(); + approval.setId(request.getId()); + approval.setCertificateFile(request.getCertificateFile()); + approval.setCertificateWordFile(request.getCertificateWordFile()); + approval.setOriginalRecordFile(request.getOriginalRecordFile()); + approval.setOriginalRecordWordFile(request.getOriginalRecordWordFile()); + int updateFlag = measureApprovalMapper.updateById(approval); log.debug("----------------update flag {}", updateFlag); Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 22c949f..407c2fb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -117,39 +117,24 @@ map.put("title", "校验结果"); break; } - //技术文件处理 + //技术文件换行展示处理 if (map.containsKey("technologyFile") && ObjectUtils.isNotEmpty(map.get("technologyFile"))) { //技术文件用逗号隔开 String technologyFiles = ((String) map.get("technologyFile")); StringBuilder fileName = new StringBuilder(); - if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains("[")) { - //替换[]、""和\ - technologyFiles = technologyFiles.replaceFirst("^\\[", "").replaceFirst("]$", "").replaceAll("\"([^\"]*)\"", "$1"); + if (StringUtils.isNotEmpty(technologyFiles) && technologyFiles.contains(",")) { String[] fileNames = technologyFiles.split(","); for (int i = 0; i < fileNames.length; i++) { String file = fileNames[i]; - String[] s = file.split("[_.]"); - //如果全部是数字并且长度为13位则放进替换列表 - List list = new ArrayList<>(); - for (String part : s) { - if (part.chars().allMatch(Character::isDigit) && part.length() == 13) { - list.add("_" + part); - } - } - for (String part : list) { - file = file.replaceAll(part, ""); - } - file = file.replace(".$", ""); - //截取文件后缀 - int lastDotIndex = file.lastIndexOf("."); - String[] split = file.split("\\."); - String suffix = split[split.length - 1]; - List suffixList = Arrays.asList("docx", "doc", "xls", "xlsx", "pdf", "ppt", "txt", "jpg", "png", "jpeg", "gif", "bmp"); - if (lastDotIndex != -1 && suffixList.contains(suffix)) { - file = file.substring(0, lastDotIndex); + String[] fileArr = file.split("_"); + if (fileArr.length > 1) { + file = fileArr[0]; } fileName.append(file).append(i < fileNames.length - 1 ? "\r\n" : ""); } + } else if (StringUtils.isNotEmpty(technologyFiles)) { + String[] split = technologyFiles.split("\\."); + fileName.append(split[0]); } else { fileName.append(technologyFiles); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index e1f3ae8..ee990e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -191,6 +191,8 @@ } if (StringUtils.isNotEmpty(safety.getFrequency()) && !"/".equals(safety.getFrequency())) { safety.setFrequency(safety.getFrequency() + safety.getFrequencyUnit()); + } else if (StringUtils.isEmpty(safety.getFrequency())) { + safety.setFrequency("/"); } safety.applyStrategyBasedOnDataType(itemCategoryName); safetyList.add(safety); @@ -281,6 +283,11 @@ } safety.setUnit(safety.getCapacity() + "/" + safety.getUnit()); } + if (StringUtils.isNotEmpty(safety.getFrequency()) && !"/".equals(safety.getFrequency())) { + safety.setFrequency(safety.getFrequency() + safety.getFrequencyUnit()); + } else if (StringUtils.isEmpty(safety.getFrequency())) { + safety.setFrequency("/"); + } safety.applyStrategyBasedOnDataType(measureApproval.getItemCategoryName()); safetyList.add(safety); } @@ -521,22 +528,26 @@ // map.put("vsec", vsec + vsecUnit); if (measureDataMap.containsKey("ACI") && CollectionUtils.isNotEmpty(measureDataMap.get("ACI"))) { map.put("frequency1", measureDataMap.get("ACI").get(0).getFrequency()); - map.put("frequencyUnit1", measureDataMap.get("ACI").get(0).getFrequencyUnit()); - map.put("unit1", measureDataMap.get("ACI").get(0).getUnit()); + //map.put("frequencyUnit1", measureDataMap.get("ACI").get(0).getFrequencyUnit()); + //map.put("unit1", measureDataMap.get("ACI").get(0).getUnit()); + map.put("unit1", "A"); map.put("measureDataCalibratorListI", measureDataMap.get("ACI")); } if (measureDataMap.containsKey("ACV") && CollectionUtils.isNotEmpty(measureDataMap.get("ACV"))) { map.put("frequency2", measureDataMap.get("ACV").get(0).getFrequency()); - map.put("frequencyUnit2", measureDataMap.get("ACV").get(0).getFrequencyUnit()); - map.put("unit2", measureDataMap.get("ACV").get(0).getUnit()); + //map.put("frequencyUnit2", measureDataMap.get("ACV").get(0).getFrequencyUnit()); + //map.put("unit2", measureDataMap.get("ACV").get(0).getUnit()); + map.put("unit2", "V"); map.put("measureDataCalibratorListV", measureDataMap.get("ACV")); } if (measureDataMap.containsKey("DCI") && CollectionUtils.isNotEmpty(measureDataMap.get("DCI"))) { - map.put("unit3", measureDataMap.get("DCI").get(0).getUnit()); + //map.put("unit3", measureDataMap.get("DCI").get(0).getUnit()); + map.put("unit3", "A"); map.put("DCIListI", measureDataMap.get("DCI")); } if (measureDataMap.containsKey("DCV") && CollectionUtils.isNotEmpty(measureDataMap.get("DCV"))) { - map.put("unit4", measureDataMap.get("DCV").get(0).getUnit()); + //map.put("unit4", measureDataMap.get("DCV").get(0).getUnit()); + map.put("unit4", "V"); map.put("DCVListV", measureDataMap.get("DCV")); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index a93d287..63b1b58 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -457,7 +457,7 @@ if (StringUtils.isEmpty(measureItemInfo.getAppearance())) { addDataRemoveItem(dataItems, -1, "外观"); } else { - map.put("firstSeq", indexList.get(titleIndex++)); + map.put("firstSeq", indexList.get(titleIndex++) + "、"); } //如果是功能校准源，则进行一下删除 switch (measureItemInfo.getItemCategoryName()) { @@ -467,7 +467,7 @@ if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "setPointGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "设定点偏差"); checkRemoveList(indexList, "setPointList", map, null, titleIndex, dataItems, 6, "otherOutcome"); @@ -477,12 +477,12 @@ if (StringUtils.isEmpty(measureItemInfo.getTightness())) { addDataRemoveItem(dataItems, -1, "密封性"); } else { - map.put("secondSeq", indexList.get(titleIndex++)); + map.put("secondSeq", indexList.get(titleIndex++) + "、"); } if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "检定数据"); checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "数据处理"); @@ -491,12 +491,12 @@ if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("secondSeq", indexList.get(titleIndex++)); + map.put("secondSeq", indexList.get(titleIndex++) + "、"); } if (StringUtils.isEmpty(measureItemInfo.getZeroDriftResult())) { addDataRemoveItem(dataItems, 4, "零点漂移"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "示值误差"); checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 6, "{{outcome}}"); @@ -505,12 +505,12 @@ if (StringUtils.isEmpty(measureItemInfo.getTightness())) { addDataRemoveItem(dataItems, -1, "密封性"); } else { - map.put("secondSeq", indexList.get(titleIndex++)); + map.put("secondSeq", indexList.get(titleIndex++) + "、"); } if (StringUtils.isEmpty(measureItemInfo.getInsulationResistance())) { addDataRemoveItem(dataItems, -1, "绝缘电阻"); } else { - map.put("thirdSeq", indexList.get(titleIndex++)); + map.put("thirdSeq", indexList.get(titleIndex++) + "、"); } titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "回程误差"); checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 4, "outcome"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java index e0b1bd9..8a12d62 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java @@ -78,6 +78,12 @@ } @Override + public ReturnDTO questionnaireDetail(Long id) { + BizResourceCustomerQuestionnaire questionnaire = questionnaireMapper.selectById(id); + return ReturnUtil.success(questionnaire); + } + + @Override public Page unrelatedListPage(Page page, CustomerQuestionnaireListRequest request) { Page questionnairePage = questionnaireMapper.selectUnrelatedListPage(page, request); return questionnairePage; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java index 8b785ba..3a91bb3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileMethodNoveltySearchServiceImpl.java @@ -114,10 +114,12 @@ for (BizResourceFileMethodNoveltySearchLog log : list) { //实验室和组别填充 BizResourceTechniqueFile techniqueFile = techniqueFileMapper.selectById(log.getFileId()); - log.setLabCode(techniqueFile.getLabCode()); - log.setGroupCode(techniqueFile.getGroupCode()); - log.setNoveltyStatus(techniqueFile.getNoveltyStatus()); - log.setLatestNoveltyDate(techniqueFile.getLatestNoveltyDate()); + if (Objects.nonNull(techniqueFile)) { + log.setLabCode(techniqueFile.getLabCode()); + log.setGroupCode(techniqueFile.getGroupCode()); + log.setNoveltyStatus(techniqueFile.getNoveltyStatus()); + log.setLatestNoveltyDate(techniqueFile.getLatestNoveltyDate()); + } DictCodeUtils.convertDictCodeToName(log); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodConfirmEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodConfirmEventPostProcessor.java index 6cef39b..2296294 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodConfirmEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodConfirmEventPostProcessor.java @@ -2,6 +2,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -79,8 +80,10 @@ updateWrapper.eq("novelty_id", confirm.getNoveltyId()); updateWrapper.eq("file_id", confirm.getFileId()); noveltySearchLogMapper.update(noveltySearchLog, updateWrapper); - //将历史文件保存到文件作废登记表草稿箱 - + //更新另一方进度条第相关节点（更新全部方法id关联的记录，保证要更新的那条被更新，其余的也更新了不重要） + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.eq("file_id", confirm.getFileId()); + noveltySearchLogMapper.update(noveltySearchLog, wrapper1); } doHandleApprovalMessage(confirm.getCreateUserId(), confirm.getProcessId(), ApplyFromIdEnum.FILE_METHOD_CONFIRM_APPROVAL.getCode(), diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodNoveltySearchEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodNoveltySearchEventPostProcessor.java index 71729b8..524516c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodNoveltySearchEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/FileMethodNoveltySearchEventPostProcessor.java @@ -101,8 +101,16 @@ techniqueFile.setNoveltyStatus(BizNoveltyStatusEnum.XC_HK_UPDATE); //更新查新进度条第二个节点 log.setAllSearchComplete(1); - log.setAllSearchCompleteDate(DateUtil.now()); + String now = DateUtil.now(); + log.setAllSearchCompleteDate(now); noveltySearchLogMapper.updateById(log); + //更新另一方进度条第二个节点（更新全部方法id关联的记录，保证要更新的那条被更新，其余的也更新了不重要） + BizResourceFileMethodNoveltySearchLog otherLog = new BizResourceFileMethodNoveltySearchLog(); + otherLog.setAllSearchComplete(1); + otherLog.setAllSearchCompleteDate(now); + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.eq("file_id", log.getFileId()); + noveltySearchLogMapper.update(otherLog, wrapper1); } else { //当创建的测试校准检定方法查新记录表中测试校准检定方法（实验室字段为全站）有查新时，需要西昌实验室/海口实验室-对应部门的人员收到消息通知 //进入该if条件，说明查新结果为有更新 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java index b5a7f90..b3bcdf0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java @@ -115,7 +115,7 @@ currentRun.setText("", 0); } } else { - Object obj = PoiPublicUtil.getRealValue(currentText, map); + Object obj = this.getRealValue(currentText, map); if (obj instanceof ImageEntity) { currentRun.setText("", 0); ExcelMapParse.addAnImage((ImageEntity) obj, currentRun); @@ -130,6 +130,27 @@ runIndex.clear(); } + public static Object getRealValue(String currentText, Map map) throws Exception { + String params = ""; + //不进行循环填充 + //while (currentText.indexOf("{{") != -1) { + if (currentText.indexOf("{{") != -1) { + params = currentText.substring(currentText.indexOf("{{") + 2, currentText.indexOf("}}")); + Object obj = PoiElUtil.eval(params.trim(), map); + if (obj instanceof ImageEntity || obj instanceof List || obj instanceof ExcelListEntity) { + return obj; + } + + if (obj != null) { + currentText = currentText.replace("{{" + params + "}}", obj.toString()); + } else { + currentText = currentText.replace("{{" + params + "}}", ""); + } + } + + return currentText; + } + //先执行预匹配，获取最大的长度，在进行之下的扩容 private Boolean checkThisTableCellIterator(List cells, XWPFTable table, Map map) throws Exception { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index ee65d6f..f541e90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -43,6 +43,12 @@ return ReturnUtil.success(super.packForBT(responsePage)); } + @ApiOperation("委托方满意度调查表详情") + @PostMapping("/detail") + public ReturnDTO questionnaireDetail(@RequestBody @Valid IdDTO idDTO) { + return questionnaireService.questionnaireDetail(idDTO.getId()); + } + @ApiOperation("未关联委托方情况报告的委托方满意度调查表列表") @PostMapping("/unrelated/listPage") public ReturnDTO> unrelatedListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) { 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 3c9d242..6e62c48 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 @@ -1122,7 +1122,7 @@ if (BigDecimal.ZERO.compareTo(rTp) == 0 || BigDecimal.ZERO.compareTo(dwstDt) == 0) { continue; } - BigDecimal deltaT = (rValue.divide(rTp, 4, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 4, RoundingMode.HALF_UP); + BigDecimal deltaT = (rValue.divide(rTp, 6, RoundingMode.HALF_UP).subtract(ws)).divide(dwstDt, 6, RoundingMode.HALF_UP); BigDecimal measureValue = rValue.subtract(deltaT.multiply(drDt)).setScale(4, RoundingMode.HALF_UP); measureData.setMeasureValue(String.valueOf(measureValue)); //项目为R'(0℃)或R'(100℃)时的测量值在允差下限、允差上限范围内，才进行α、△t、△α计算，否则直接为不合格 diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml index 49538fb..e8e94cd 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceFileMethodNoveltySearchMapper.xml @@ -20,13 +20,13 @@ - - - - - - - + + + + + + + @@ -35,9 +35,9 @@