diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index 26944e7..fb3b8d8 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-2.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index 26944e7..fb3b8d8 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-2.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 88f164a..17d2e18 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -27,7 +27,7 @@ import java.util.List; /** - * @Description: 任务计量管理-检定审批管理(相当于原本的证书审批模块),将证书报告和原始记录放在一起 + * @Description: 任务计量管理-检定审批管理(相当于徐州的证书审批模块),将证书报告和原始记录放在一起 * 只要新建走审批,删除按钮前端配置权限,只有指定人可以看见 * @Author: wangpeng * @Date: 2023/10/10 15:56 diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index 26944e7..fb3b8d8 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-2.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 88f164a..17d2e18 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -27,7 +27,7 @@ import java.util.List; /** - * @Description: 任务计量管理-检定审批管理(相当于原本的证书审批模块),将证书报告和原始记录放在一起 + * @Description: 任务计量管理-检定审批管理(相当于徐州的证书审批模块),将证书报告和原始记录放在一起 * 只要新建走审批,删除按钮前端配置权限,只有指定人可以看见 * @Author: wangpeng * @Date: 2023/10/10 15:56 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 d465dd7..bc34bca 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 @@ -570,7 +570,7 @@ BigDecimal maxIndicatingErrorTransfer = indicatingErrorTransferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); pistonGaugeData.setMaxIndicatingError(String.valueOf(indicatingErrorTransferList.stream().filter(x -> x.abs().equals(maxIndicatingErrorTransfer)).findFirst().get())); BigDecimal maxReturnErrorTransfer = returnErrorTransferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); - pistonGaugeData.setMaxReturnError(String.valueOf(indicatingErrorTransferList.stream().filter(x -> x.abs().equals(maxReturnErrorTransfer)).findFirst().get())); + pistonGaugeData.setMaxReturnError(String.valueOf(returnErrorTransferList.stream().filter(x -> x.abs().equals(maxReturnErrorTransfer)).findFirst().get())); measureDataList.add(pistonGaugeData); } diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index 26944e7..fb3b8d8 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-2.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 88f164a..17d2e18 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -27,7 +27,7 @@ import java.util.List; /** - * @Description: 任务计量管理-检定审批管理(相当于原本的证书审批模块),将证书报告和原始记录放在一起 + * @Description: 任务计量管理-检定审批管理(相当于徐州的证书审批模块),将证书报告和原始记录放在一起 * 只要新建走审批,删除按钮前端配置权限,只有指定人可以看见 * @Author: wangpeng * @Date: 2023/10/10 15:56 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 d465dd7..bc34bca 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 @@ -570,7 +570,7 @@ BigDecimal maxIndicatingErrorTransfer = indicatingErrorTransferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); pistonGaugeData.setMaxIndicatingError(String.valueOf(indicatingErrorTransferList.stream().filter(x -> x.abs().equals(maxIndicatingErrorTransfer)).findFirst().get())); BigDecimal maxReturnErrorTransfer = returnErrorTransferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); - pistonGaugeData.setMaxReturnError(String.valueOf(indicatingErrorTransferList.stream().filter(x -> x.abs().equals(maxReturnErrorTransfer)).findFirst().get())); + pistonGaugeData.setMaxReturnError(String.valueOf(returnErrorTransferList.stream().filter(x -> x.abs().equals(maxReturnErrorTransfer)).findFirst().get())); measureDataList.add(pistonGaugeData); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java index de59914..ba74167 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java @@ -10,7 +10,7 @@ /** *

- * 计量检定业务-任务计量管理-证书管理 + * 计量检定业务-任务计量管理-证书管理(相当于徐州的证书打印管理) *

* * @author wangpeng diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index 26944e7..fb3b8d8 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-2.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 88f164a..17d2e18 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -27,7 +27,7 @@ import java.util.List; /** - * @Description: 任务计量管理-检定审批管理(相当于原本的证书审批模块),将证书报告和原始记录放在一起 + * @Description: 任务计量管理-检定审批管理(相当于徐州的证书审批模块),将证书报告和原始记录放在一起 * 只要新建走审批,删除按钮前端配置权限,只有指定人可以看见 * @Author: wangpeng * @Date: 2023/10/10 15:56 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 d465dd7..bc34bca 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 @@ -570,7 +570,7 @@ BigDecimal maxIndicatingErrorTransfer = indicatingErrorTransferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); pistonGaugeData.setMaxIndicatingError(String.valueOf(indicatingErrorTransferList.stream().filter(x -> x.abs().equals(maxIndicatingErrorTransfer)).findFirst().get())); BigDecimal maxReturnErrorTransfer = returnErrorTransferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); - pistonGaugeData.setMaxReturnError(String.valueOf(indicatingErrorTransferList.stream().filter(x -> x.abs().equals(maxReturnErrorTransfer)).findFirst().get())); + pistonGaugeData.setMaxReturnError(String.valueOf(returnErrorTransferList.stream().filter(x -> x.abs().equals(maxReturnErrorTransfer)).findFirst().get())); measureDataList.add(pistonGaugeData); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java index de59914..ba74167 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java @@ -10,7 +10,7 @@ /** *

- * 计量检定业务-任务计量管理-证书管理 + * 计量检定业务-任务计量管理-证书管理(相当于徐州的证书打印管理) *

* * @author wangpeng 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 0fd1c5c..0ef416a 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 @@ -24,7 +24,7 @@ /** *

- * 计量检定业务-任务计量管理-检定审批管理 + * 计量检定业务-任务计量管理-检定审批管理(相当于徐州的证书审批模块) *

* * @author wangpeng diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh index 26944e7..fb3b8d8 100644 --- a/casic-metering-api/src/main/build/bin/start.sh +++ b/casic-metering-api/src/main/build/bin/start.sh @@ -1 +1 @@ -nohup java -jar ./lib/casic-metering-api-2.0.0.jar > /dev/null 2>&1 & \ No newline at end of file +nohup java -jar ./lib/casic-metering-api-1.0.0.jar > /dev/null 2>&1 & \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 88f164a..17d2e18 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -27,7 +27,7 @@ import java.util.List; /** - * @Description: 任务计量管理-检定审批管理(相当于原本的证书审批模块),将证书报告和原始记录放在一起 + * @Description: 任务计量管理-检定审批管理(相当于徐州的证书审批模块),将证书报告和原始记录放在一起 * 只要新建走审批,删除按钮前端配置权限,只有指定人可以看见 * @Author: wangpeng * @Date: 2023/10/10 15:56 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 d465dd7..bc34bca 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 @@ -570,7 +570,7 @@ BigDecimal maxIndicatingErrorTransfer = indicatingErrorTransferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); pistonGaugeData.setMaxIndicatingError(String.valueOf(indicatingErrorTransferList.stream().filter(x -> x.abs().equals(maxIndicatingErrorTransfer)).findFirst().get())); BigDecimal maxReturnErrorTransfer = returnErrorTransferList.stream().map(BigDecimal::abs).max(BigDecimal::compareTo).get(); - pistonGaugeData.setMaxReturnError(String.valueOf(indicatingErrorTransferList.stream().filter(x -> x.abs().equals(maxReturnErrorTransfer)).findFirst().get())); + pistonGaugeData.setMaxReturnError(String.valueOf(returnErrorTransferList.stream().filter(x -> x.abs().equals(maxReturnErrorTransfer)).findFirst().get())); measureDataList.add(pistonGaugeData); } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java index de59914..ba74167 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessCertificatePrint.java @@ -10,7 +10,7 @@ /** *

- * 计量检定业务-任务计量管理-证书管理 + * 计量检定业务-任务计量管理-证书管理(相当于徐州的证书打印管理) *

* * @author wangpeng 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 0fd1c5c..0ef416a 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 @@ -24,7 +24,7 @@ /** *

- * 计量检定业务-任务计量管理-检定审批管理 + * 计量检定业务-任务计量管理-检定审批管理(相当于徐州的证书审批模块) *

* * @author wangpeng diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index b5895e4..979b757 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.service.Impl; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -200,11 +201,16 @@ protected ReturnDTO updateApprovalStatus(Long id, String processId, String approvalStatus) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", id); - updateWrapper.set("approval_status", approvalStatus); if(StringUtils.isNotEmpty(processId)){ updateWrapper.set("process_id", processId); } - updateWrapper.isNull("approval_status"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id", id); + queryWrapper.eq("approval_status", ApprovalStatusEnum.PASSED); + T one = this.getOne(queryWrapper); + if (Objects.isNull(one)) { + updateWrapper.set("approval_status", approvalStatus); + } this.update(updateWrapper); return ReturnUtil.success(); }