From 809088d9b37f353ed66e2c9cbc9b5e66b19dacc4 Mon Sep 17 00:00:00 2001 From: FCL Date: Wed, 25 Mar 2026 15:28:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=84=8F=E8=A7=81=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=E6=A3=80=E5=AE=9A=E6=A0=A1=E5=87=86?= =?UTF-8?q?=E3=80=81=E6=9C=9F=E9=97=B4=E6=A0=B8=E6=9F=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/controller/vo/DataOpinionRespVO.java | 9 +++++++ .../data/service/DataOpinionService.java | 2 ++ .../data/service/DataOpinionServiceImpl.java | 26 +++++++++++++++++++ .../admin/DeviceCalibrationController.java | 7 ++--- .../admin/DevicePeriodCheckController.java | 7 ++--- .../controller/vo/DeviceCalibrationVO.java | 3 +++ .../controller/vo/DevicePeriodCheckVO.java | 5 ++++ .../service/DeviceCalibrationService.java | 2 +- .../service/DeviceCalibrationServiceImpl.java | 9 +++++-- .../service/DevicePeriodCheckService.java | 2 +- .../service/DevicePeriodCheckServiceImpl.java | 9 +++++-- 11 files changed, 69 insertions(+), 12 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionRespVO.java index c79f8413..dae2219f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionRespVO.java @@ -83,4 +83,13 @@ public class DataOpinionRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + + //===========扩展字段 + + @Schema(description = "审批时间年月日") + @ExcelProperty("审批时间年月日") + private String opinionTimeYYYYMMDD; + + @Schema(description = "base64签名图片") + private String signatureIdBase64; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java index 1b672932..43c4c95e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java @@ -28,6 +28,8 @@ public interface DataOpinionService { List getListByFlowInsId(String flowInsId); + JSONObject assembleOpinion(Long busId); + /** * 创建审批意见 * diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java index c76b80f0..c64a5280 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java @@ -1,6 +1,7 @@ package com.zt.plat.module.qms.common.data.service; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import com.zt.plat.module.qms.common.data.dal.dataobject.DataOpinionDO; @@ -105,6 +107,30 @@ public class DataOpinionServiceImpl implements DataOpinionService { return dataOpinionMapper.selectList(query); } + @Override + public JSONObject assembleOpinion(Long busId) { + List opinionList = this.getListByBusId(busId); + List opinionRespVOList = BeanUtils.toBean(opinionList, DataOpinionRespVO.class); + List signatureIdList = opinionRespVOList.stream().map(DataOpinionRespVO::getOpinionSignatureId).distinct().toList(); + List signatureList = new ArrayList<>(); + if(!signatureIdList.isEmpty()) + signatureList = configUserSignatureService.getByIdList(signatureIdList); + JSONObject opinion = new JSONObject(); + for(DataOpinionRespVO opinionRespVO : opinionRespVOList){ + for(ConfigUserSignatureDO signature : signatureList){ + if(signature.getId().equals(opinionRespVO.getOpinionSignatureId())){ + opinionRespVO.setSignatureIdBase64(signature.getSignatureContent()); + } + } + if(opinionRespVO.getOpinionTime() != null){ + opinionRespVO.setOpinionTimeYYYYMMDD(DateUtil.format(opinionRespVO.getOpinionTime(), "yyyy-MM-dd")); + } + String nodeKey = opinionRespVO.getNodeKey(); + opinion.put(nodeKey, opinionRespVO); + } + return opinion; + } + @Override public DataOpinionRespVO createDataOpinion(DataOpinionSaveReqVO createReqVO) { // 插入 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java index e193c5cc..88eacac1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java @@ -67,9 +67,10 @@ public class DeviceCalibrationController extends AbstractFileUploadController im @PutMapping("/update") @Operation(summary = "更新设备-检定校准") - public CommonResult updateDeviceCalibration(@Valid @RequestBody DeviceCalibrationSaveReqVO updateReqVO) { - deviceCalibrationService.updateDeviceCalibration(updateReqVO); - return success(true); + public CommonResult updateDeviceCalibration(@Valid @RequestBody DeviceCalibrationSaveReqVO updateReqVO) { + DeviceCalibrationDO entity = deviceCalibrationService.updateDeviceCalibration(updateReqVO); + DeviceCalibrationRespVO vo = BeanUtils.toBean(entity, DeviceCalibrationRespVO.class); + return success(vo); } @DeleteMapping("/delete") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java index 9fa3d782..881c5a24 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java @@ -65,9 +65,10 @@ public class DevicePeriodCheckController extends AbstractFileUploadController im @PutMapping("/update") @Operation(summary = "更新设备-期间核查") - public CommonResult updateDevicePeriodCheck(@Valid @RequestBody DevicePeriodCheckSaveReqVO updateReqVO) { - devicePeriodCheckService.updateDevicePeriodCheck(updateReqVO); - return success(true); + public CommonResult updateDevicePeriodCheck(@Valid @RequestBody DevicePeriodCheckSaveReqVO updateReqVO) { + DevicePeriodCheckDO entity = devicePeriodCheckService.updateDevicePeriodCheck(updateReqVO); + DevicePeriodCheckRespVO vo = BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class); + return success(vo); } @DeleteMapping("/delete") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationVO.java index 2cd9c958..a866fabc 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationVO.java @@ -52,4 +52,7 @@ public class DeviceCalibrationVO extends DeviceCalibrationRespVO{ private String deviceCode; //管理编号 private String factoryCode; //出厂编号 + + //============其他字段============ + private JSONObject signatureData; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckVO.java index b9b7577e..5b4acbc7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DevicePeriodCheckVO.java @@ -51,4 +51,9 @@ public class DevicePeriodCheckVO extends DevicePeriodCheckRespVO{ private String deviceCode; //管理编号 private String factoryCode; //出厂编号 + + + //============其他字段============ + private JSONObject signatureData; + } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationService.java index 123c9d3c..aefc970e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationService.java @@ -44,7 +44,7 @@ public interface DeviceCalibrationService { * * @param updateReqVO 更新信息 */ - void updateDeviceCalibration(@Valid DeviceCalibrationSaveReqVO updateReqVO); + DeviceCalibrationDO updateDeviceCalibration(@Valid DeviceCalibrationSaveReqVO updateReqVO); /** * 删除设备-检定校准 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java index dfdc83e8..7f663cdf 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java @@ -205,12 +205,13 @@ public class DeviceCalibrationServiceImpl implements DeviceCalibrationService, B } @Override - public void updateDeviceCalibration(DeviceCalibrationSaveReqVO updateReqVO) { + public DeviceCalibrationDO updateDeviceCalibration(DeviceCalibrationSaveReqVO updateReqVO) { // 校验存在 validateDeviceCalibrationExists(updateReqVO.getId()); // 更新 DeviceCalibrationDO updateObj = BeanUtils.toBean(updateReqVO, DeviceCalibrationDO.class); deviceCalibrationMapper.updateById(updateObj); + return updateObj; } @Override @@ -256,7 +257,11 @@ public class DeviceCalibrationServiceImpl implements DeviceCalibrationService, B PageResult pageResult = new PageResult<>(pageList.getRecords(), pageList.getTotal()); if(pageResult.getList().isEmpty()) return null; - return pageResult.getList().get(0); + DeviceCalibrationVO vo = pageResult.getList().get(0); + //处理审批意见 + JSONObject opinion = dataOpinionService.assembleOpinion(id); + vo.setSignatureData( opinion); + return vo; } @Override diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckService.java index db0e0f7e..60b142a7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckService.java @@ -47,7 +47,7 @@ public interface DevicePeriodCheckService { * * @param updateReqVO 更新信息 */ - void updateDevicePeriodCheck(@Valid DevicePeriodCheckSaveReqVO updateReqVO); + DevicePeriodCheckDO updateDevicePeriodCheck(@Valid DevicePeriodCheckSaveReqVO updateReqVO); /** * 删除设备-期间核查 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java index 96a6c7cd..fef66b48 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java @@ -207,7 +207,11 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B PageResult pageResult = new PageResult<>(pageList.getRecords(), pageList.getTotal()); if(pageResult.getList().isEmpty()) return null; - return pageResult.getList().get(0); + DevicePeriodCheckVO vo = pageResult.getList().get(0); + //处理审批意见 + JSONObject opinion = dataOpinionService.assembleOpinion(id); + vo.setSignatureData( opinion); + return vo; } @Override @@ -220,12 +224,13 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B } @Override - public void updateDevicePeriodCheck(DevicePeriodCheckSaveReqVO updateReqVO) { + public DevicePeriodCheckDO updateDevicePeriodCheck(DevicePeriodCheckSaveReqVO updateReqVO) { // 校验存在 validateDevicePeriodCheckExists(updateReqVO.getId()); // 更新 DevicePeriodCheckDO updateObj = BeanUtils.toBean(updateReqVO, DevicePeriodCheckDO.class); devicePeriodCheckMapper.updateById(updateObj); + return updateObj; } @Override