diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceInfomationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceInfomationController.java index 3fb636c6..c83a016a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceInfomationController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceInfomationController.java @@ -16,6 +16,7 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationPageReqVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationRespVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationSaveReqVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationWithProductVO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfomationDO; import com.zt.plat.module.qms.resource.device.service.DeviceInfomationService; import com.zt.plat.module.qms.resource.device.service.DeviceProductService; @@ -119,16 +120,15 @@ public class DeviceInfomationController extends AbstractFileUploadController imp @GetMapping("/get") @Operation(summary = "获得设备-设备信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") -// @PreAuthorize("@ss.hasPermission('resource:device-infomation:query')") - public CommonResult getDeviceInfomation(@RequestParam("id") Long id) { - DeviceInfomationDO deviceInfomation = deviceInfomationService.getDeviceInfomation(id); - return success(BeanUtils.toBean(deviceInfomation, DeviceInfomationRespVO.class)); + public CommonResult getDeviceInfomation(@RequestParam("id") Long id) { + DeviceInfomationWithProductVO deviceInfomation = deviceInfomationService.getDeviceWithProduct(id); + return success(deviceInfomation); } + @GetMapping("/page") @Operation(summary = "获得设备-设备信息分页") -// @PreAuthorize("@ss.hasPermission('resource:device-infomation:query')") - public CommonResult> getDeviceInfomationPage(@Valid DeviceInfomationPageReqVO pageReqVO) { + public CommonResult> getDeviceInfomationPage(@Valid DeviceInfomationPageReqVO pageReqVO) { Long productId = pageReqVO.getProductId(); if(productId != null){ List productIds = deviceProductService.getIdListByIdPath(productId); @@ -142,8 +142,8 @@ public class DeviceInfomationController extends AbstractFileUploadController imp deviceStatus = "{\"Enable\":\"1\"}"; if(!ObjectUtils.isEmpty(deviceStatus)) pageReqVO.setDeviceStatusJson(JSON.parseObject(deviceStatus)); - PageResult pageResult = deviceInfomationService.getDeviceInfomationPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, DeviceInfomationRespVO.class)); + PageResult pageResult = deviceInfomationService.getDeviceInfomationPage(pageReqVO); + return success(pageResult); } @GetMapping("/export-excel") @@ -153,7 +153,7 @@ public class DeviceInfomationController extends AbstractFileUploadController imp public void exportDeviceInfomationExcel(@Valid DeviceInfomationPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = deviceInfomationService.getDeviceInfomationPage(pageReqVO).getList(); + List list = deviceInfomationService.getDeviceInfomationPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "设备-设备信息.xls", "数据", DeviceInfomationRespVO.class, BeanUtils.toBean(list, DeviceInfomationRespVO.class)); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceUseRecordController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceUseRecordController.java index 0bc660b0..2e74df2b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceUseRecordController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceUseRecordController.java @@ -63,8 +63,8 @@ public class DeviceUseRecordController extends AbstractFileUploadController impl @GetMapping("/queryPageListWithCount") @Operation(summary = "使用记录分页列表查询（以设备为主数据）") - public CommonResult> queryPageListWithCount(@Valid DeviceUseRecordPageReqVO pageReqVO) { - PageResult pageResult = deviceUseRecordService.queryPageListWithCount(pageReqVO); + public CommonResult> queryPageListWithCount(@Valid DeviceUseRecordPageReqVO pageReqVO) { + PageResult pageResult = deviceUseRecordService.queryPageListWithCount(pageReqVO); return success(pageResult); } @@ -98,7 +98,7 @@ public class DeviceUseRecordController extends AbstractFileUploadController impl @PutMapping("/update") @Operation(summary = "更新设备-使用记录") - @PreAuthorize("@ss.hasPermission('qms:device-use-record:update')") +// @PreAuthorize("@ss.hasPermission('qms:device-use-record:update')") public CommonResult updateDeviceUseRecord(@Valid @RequestBody DeviceUseRecordSaveReqVO reqVO) { Long deviceId = reqVO.getDeviceId(); if(deviceId == null) @@ -110,7 +110,7 @@ public class DeviceUseRecordController extends AbstractFileUploadController impl @DeleteMapping("/delete") @Operation(summary = "删除设备-使用记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:device-use-record:delete')") +// @PreAuthorize("@ss.hasPermission('qms:device-use-record:delete')") public CommonResult deleteDeviceUseRecord(@RequestParam("id") Long id) { deviceUseRecordService.deleteDeviceUseRecord(id); return success(true); @@ -128,7 +128,7 @@ public class DeviceUseRecordController extends AbstractFileUploadController impl @GetMapping("/get") @Operation(summary = "获得设备-使用记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:device-use-record:query')") +// @PreAuthorize("@ss.hasPermission('qms:device-use-record:query')") public CommonResult getDeviceUseRecord(@RequestParam("id") Long id) { DeviceUseRecordDO deviceUseRecord = deviceUseRecordService.getDeviceUseRecord(id); return success(BeanUtils.toBean(deviceUseRecord, DeviceUseRecordRespVO.class)); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationPageReqVO.java index 4a1ba429..db641b15 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationPageReqVO.java @@ -16,6 +16,9 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH @Data public class DeviceInfomationPageReqVO extends PageParam { + @Schema(description = "id", example = "32101") + private Long id; + @Schema(description = "设备大类id", example = "32101") private Long productId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationUseRecordVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationUseRecordVO.java new file mode 100644 index 00000000..49078b68 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationUseRecordVO.java @@ -0,0 +1,25 @@ +package com.zt.plat.module.qms.resource.device.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +/* +* 设备含使用记录数 +* */ +@Data +public class DeviceInfomationUseRecordVO extends DeviceInfomationWithProductVO { + + //============使用记录数============ + @Schema(description = "未提交数据量") + private Integer runningCount; + + @Schema(description = "已提交数据量") + private Integer finishedCount; + + + //============查询字段============ + @Schema(description = "截止时间不为空") + private String useTimeEndFlag; + +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationWithProductVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationWithProductVO.java new file mode 100644 index 00000000..497bdae4 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationWithProductVO.java @@ -0,0 +1,48 @@ +package com.zt.plat.module.qms.resource.device.controller.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/* +* 设备与大类实体 +* +* */ +@Data +public class DeviceInfomationWithProductVO extends DeviceInfomationRespVO{ + + //=========设备字段============ + + private Long companyId; + private String companyName; + + private Long deptId; + + @Schema(description = "所属部门名称") + private String deptName; + + private Long postId; + private Long tenantId; + + private String updaterName; + private String creatorName; + private LocalDateTime createTime; + private LocalDateTime updateTime; + private String creator; + private String updater; + + //============大类字段============ + + @Schema(description = "规格") + private String specification; + + @Schema(description = "型号") + private String modelNo; + + @Schema(description = "制造商") + private String manufacturer; + + +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordSaveReqVO.java index 2e86bf73..8ebbe58c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordSaveReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.qms.resource.device.controller.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -24,9 +25,11 @@ public class DeviceUseRecordSaveReqVO { private Long userId; @Schema(description = "开始使用时间") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime useTimeStart; @Schema(description = "结束使用时间") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime useTimeEnd; @Schema(description = "使用记录") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordVO.java index 58f00f24..8b2998a7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordVO.java @@ -1,79 +1,42 @@ -package com.zt.plat.module.qms.resource.device.controller.vo; - -import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceMaintainItemDO; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.List; - -@Schema(description = "管理后台 - 设备使用记录VO") -@Data -public class DeviceUseRecordVO extends DeviceUseRecordRespVO { - - - //============大类字段============ - @Schema(description = "产品id") - private Long productId; - - @Schema(description = "规格") - private String specification; - - @Schema(description = "型号") - private String modelNo; - - @Schema(description = "制造商") - private String manufacturer; - - //============设备字段============ - @Schema(description = "设备名称") - private String deviceName; - - @Schema(description = "别名") - private String alias; - - @Schema(description = "管理编号") - private String deviceCode; - - @Schema(description = "资产编号") - private String assetCode; - - @Schema(description = "出厂编号") - private String factoryCode; - - @Schema(description = "所属部门名称") - private String deptName; - - @Schema(description = "维修状态: 1-维修；0-正常") - private Integer repairFlag; - - @Schema(description = "降级状态") - private Integer demoteFlag; - - @Schema(description = "报废状态") - private Integer scrapFlag; - - @Schema(description = "停用状态") - private Integer disableFlag; - - @Schema(description = "外借状态") - private Integer lendFlag; - - @Schema(description = "使用中状态") - private Integer inUseFlag; - - @Schema(description = "验收状态") - private String acceptFlag; - - - //============其他字段============ - @Schema(description = "未提交数据量") - private Integer runningCount; - - @Schema(description = "已提交数据量") - private Integer finishedCount; - - @Schema(description = "截止时间不为空") - private String useTimeEndFlag; - - -} +//package com.zt.plat.module.qms.resource.device.controller.vo; +// +//import io.swagger.v3.oas.annotations.media.Schema; +//import lombok.Data; +// +//import java.util.List; +// +//@Schema(description = "管理后台 - 设备使用记录VO") +//@Data +//public class DeviceUseRecordVO extends DeviceUseRecordRespVO { +// +// +// +// +// //============设备字段============ +// @Schema(description = "设备名称") +// private String deviceName; +// +// @Schema(description = "别名") +// private String alias; +// +// @Schema(description = "管理编号") +// private String deviceCode; +// +// @Schema(description = "资产编号") +// private String assetCode; +// +// @Schema(description = "出厂编号") +// private String factoryCode; +// +// +// +// @Schema(description = "设备状态JSON") +// private String deviceStatus; +// +// @Schema(description = "使用中状态") +// private Integer inUseFlag; +// +// +// +// +//} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.java index fe1f490e..f8bd6413 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.java @@ -7,6 +7,7 @@ import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.qms.core.aspect.annotation.QmsPermission; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationPageReqVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationWithProductVO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfoWithBizConfigVO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfomationDO; import org.apache.ibatis.annotations.Mapper; @@ -26,7 +27,7 @@ import static com.zt.plat.module.qms.enums.QmsPermissionConstant.DEVICE_MANAGER; @Mapper public interface DeviceInfomationMapper extends BaseMapperX { - Page selectPage(IPage page, @Param("param") DeviceInfomationPageReqVO param); + Page selectPage(IPage page, @Param("param") DeviceInfomationPageReqVO param); //查询需要“某个业务类型”的设备列表 List getListNeedByRule(@Param("param") Map param); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java index 539b0fe0..119721e3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationWithProductVO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceUseRecordDO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordPageReqVO; import org.apache.ibatis.annotations.Mapper; @@ -39,8 +39,10 @@ public interface DeviceUseRecordMapper extends BaseMapperX { .orderByDesc(DeviceUseRecordDO::getId)); } - IPage queryPageListWithCount(Page page, @Param("param") DeviceUseRecordPageReqVO param); - DeviceUseRecordVO queryVoById(@Param("id") Long id); + IPage queryPageListWithCount(Page page, @Param("param") DeviceUseRecordPageReqVO param); + + +// DeviceUseRecordVO queryVoById(@Param("id") Long id); } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationService.java index 73b65f7c..c7407b85 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationService.java @@ -6,6 +6,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationPageReqVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationRespVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationSaveReqVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationWithProductVO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfoWithBizConfigVO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfomationDO; import jakarta.validation.Valid; @@ -90,6 +91,7 @@ public interface DeviceInfomationService { * @return 设备-设备信息 */ DeviceInfomationDO getDeviceInfomation(Long id); + DeviceInfomationWithProductVO getDeviceWithProduct(Long id); /** * 获得设备-设备信息分页 @@ -97,6 +99,6 @@ public interface DeviceInfomationService { * @param pageReqVO 分页查询 * @return 设备-设备信息分页 */ - PageResult getDeviceInfomationPage(DeviceInfomationPageReqVO pageReqVO); + PageResult getDeviceInfomationPage(DeviceInfomationPageReqVO pageReqVO); } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationServiceImpl.java index 0b20b507..e7989c67 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationServiceImpl.java @@ -15,6 +15,7 @@ import com.zt.plat.module.qms.core.constant.DataTypeConstant; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationPageReqVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationRespVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationSaveReqVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationWithProductVO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfoWithBizConfigVO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfomationDO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceProductDO; @@ -95,7 +96,7 @@ public class DeviceInfomationServiceImpl implements DeviceInfomationService { return CommonResult.success(true); JSONObject deviceStatusJson = JSON.parseObject(deviceStatus); - if ("1".equals(deviceStatusJson.getString(DeviceBizEnum.enable.getCode()))) + if (!"1".equals(deviceStatusJson.getString(DeviceBizEnum.enable.getCode()))) return CommonResult.error(DEVICE_INFOMATION_NOT_EXISTS.getCode(), "设备已停用！"); if ("1".equals(deviceStatusJson.getString(DeviceBizEnum.scrap.getCode()))) return CommonResult.error(DEVICE_INFOMATION_NOT_EXISTS.getCode(), "设备已报废！"); @@ -323,10 +324,21 @@ public class DeviceInfomationServiceImpl implements DeviceInfomationService { } @Override - public PageResult getDeviceInfomationPage(DeviceInfomationPageReqVO pageReqVO) { + public DeviceInfomationWithProductVO getDeviceWithProduct(Long id) { + IPage page = new Page<>(1, 1); + DeviceInfomationPageReqVO pageReqVO = new DeviceInfomationPageReqVO(); + pageReqVO.setId(id); + Page pageList = deviceInfomationMapper.selectPage(page, pageReqVO); + if(!pageList.getRecords().isEmpty()) + return pageList.getRecords().get(0); + return null; + } + + @Override + public PageResult getDeviceInfomationPage(DeviceInfomationPageReqVO pageReqVO) { IPage page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - Page pageList = deviceInfomationMapper.selectPage(page, pageReqVO); - PageResult pageResult = new PageResult<>(pageList.getRecords(), pageList.getTotal()); + Page pageList = deviceInfomationMapper.selectPage(page, pageReqVO); + PageResult pageResult = new PageResult<>(pageList.getRecords(), pageList.getTotal()); return pageResult; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordService.java index 3bc119d6..1d5be525 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordService.java @@ -16,7 +16,7 @@ import com.zt.plat.framework.common.pojo.PageResult; public interface DeviceUseRecordService { - PageResult queryPageListWithCount(DeviceUseRecordPageReqVO reqVO); + PageResult queryPageListWithCount(DeviceUseRecordPageReqVO reqVO); /** * 创建设备-使用记录 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordServiceImpl.java index fddb3f2b..05ad0903 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceUseRecordServiceImpl.java @@ -40,7 +40,7 @@ public class DeviceUseRecordServiceImpl implements DeviceUseRecordService { @Resource private DeviceUseRecordMapper deviceUseRecordMapper; @Override - public PageResult queryPageListWithCount(DeviceUseRecordPageReqVO reqVO) { + public PageResult queryPageListWithCount(DeviceUseRecordPageReqVO reqVO) { Long productId = reqVO.getProductId(); if(productId != null){ List productIds = deviceProductService.getIdListByIdPath(productId); @@ -50,8 +50,8 @@ public class DeviceUseRecordServiceImpl implements DeviceUseRecordService { reqVO.setDeviceIdList(deviceIds); } } - Page page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize()); - IPage pageList = deviceUseRecordMapper.queryPageListWithCount(page, reqVO); + Page page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize()); + IPage pageList = deviceUseRecordMapper.queryPageListWithCount(page, reqVO); return new PageResult<>(pageList.getRecords(), pageList.getTotal()); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.xml index de991443..e6bc64f7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.xml @@ -9,7 +9,8 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - + + @@ -54,12 +55,24 @@ + + + + + select + d.*, p.MFR, p.SPEC, p.MDL_NO - - - - - -