zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:设备检定校准细节调整

Browse Source
This commit is contained in:
FCL
2026-03-24 11:50:08 +08:00
parent 6077ee78f0
commit 629092ffbe
6 changed files with 97 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java
View File

@@ -2,10 +2,7 @@ package com.zt.plat.module.qms.resource.device.controller.admin;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceCalibrationPageReqVO;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceCalibrationRespVO;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceCalibrationSaveReqVO;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceCalibrationVO;
import com.zt.plat.module.qms.resource.device.controller.vo.*;
import com.zt.plat.module.qms.resource.device.service.DeviceCalibrationPlanService;
import com.zt.plat.module.qms.resource.device.service.DeviceProductService;
import org.springframework.util.ObjectUtils;
@@ -100,9 +97,23 @@ public class DeviceCalibrationController extends AbstractFileUploadController im
return success(BeanUtils.toBean(deviceCalibration, DeviceCalibrationRespVO.class));
}
@GetMapping("/getVO")
@Operation(summary = "获得设备-检定校准")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<DeviceCalibrationVO> getVO(@RequestParam("id") Long id) {
DeviceCalibrationVO vo = deviceCalibrationService.getDeviceCalibrationVO(id);
return success(vo);
}
@RequestMapping("/submitApply")
@Operation(summary = "提交申请")
public CommonResult<DeviceCalibrationRespVO> submitApply(@RequestBody DeviceCalibrationSaveReqVO param) {
return deviceCalibrationService.submitApply(param);
}
@GetMapping("/page")
@Operation(summary = "获得设备-检定校准分页")
public CommonResult<PageResult<DeviceCalibrationRespVO>> getDeviceCalibrationPage(@Valid DeviceCalibrationPageReqVO param) {
public CommonResult<PageResult<DeviceCalibrationVO>> getDeviceCalibrationPage(@Valid DeviceCalibrationPageReqVO param) {
Page<DeviceCalibrationPageReqVO> page = new Page<>(param.getPageNo(), param.getPageSize());
Long productId = param.getProductId();

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationPlanController.java
View File

@@ -59,6 +59,12 @@ public class DeviceCalibrationPlanController extends AbstractFileUploadControlle
return deviceCalibrationPlanService.createPlan(checkYear);
}
@RequestMapping("/savePlan")
@Operation(summary = "编辑计划")
public CommonResult<DeviceCalibrationPlanRespVO> savePlan(@RequestBody DeviceCalibrationPlanSaveReqVO param) {
return deviceCalibrationPlanService.savePlan(param);
}
@RequestMapping("/submitApply")
@Operation(summary = "提交申请")
public CommonResult<DeviceCalibrationPlanRespVO> submitApply(@RequestBody DeviceCalibrationPlanSaveReqVO param) {

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceCalibrationPageReqVO.java
View File

@@ -13,6 +13,9 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class DeviceCalibrationPageReqVO extends PageParam {
@Schema(description = "ID")
private Long id;
@Schema(description = "检定校准计划id", example = "22068")
private Long planId;

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationService.java
View File

@@ -5,10 +5,7 @@ import java.util.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceCalibrationPageReqVO;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceCalibrationRespVO;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceCalibrationSaveReqVO;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceCalibrationVO;
import com.zt.plat.module.qms.resource.device.controller.vo.*;
import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceCalibrationPlanDO;
import jakarta.validation.*;
import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceCalibrationDO;
@@ -32,6 +29,8 @@ public interface DeviceCalibrationService {
List<DeviceCalibrationDO> getListByPlanId(Long planId);
CommonResult<DeviceCalibrationRespVO> submitApply(DeviceCalibrationSaveReqVO paramVO);
/**
* 创建设备-检定校准
*
@@ -68,6 +67,7 @@ public interface DeviceCalibrationService {
* @return 设备-检定校准
*/
DeviceCalibrationDO getDeviceCalibration(Long id);
DeviceCalibrationVO getDeviceCalibrationVO(Long id);
/**
* 获得设备-检定校准分页

69
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

3
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml
View File

@@ -86,6 +86,9 @@
left join T_DEV_INF d on c.DEV_ID = d.ID
left join T_DEV_PDT p on d.PDT_ID = p.ID
<where>
<if test="param.id != null">
and c.ID = #{param.id}
</if>
<if test="param.deviceId != null">
and c.DEV_ID = #{param.deviceId}
</if>