From 2247f6df5f138c27efa1d86f4043b52cdb5495ee Mon Sep 17 00:00:00 2001 From: FCL Date: Mon, 9 Mar 2026 11:20:39 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=BE=E5=A4=87-=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E4=BF=9D=E5=85=BB=E3=80=81=E4=BD=BF=E7=94=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DeviceMaintainController.java | 9 +- .../admin/DeviceUseRecordController.java | 4 +- .../vo/DeviceInfomationMaintainVO.java | 25 +++++ .../controller/vo/DeviceMaintainVO.java | 20 +--- .../dal/mapper/DeviceMaintainMapper.java | 9 +- .../dal/mapper/DeviceUseRecordMapper.java | 3 +- .../DeviceConfigBusinessRuleServiceImpl.java | 2 + .../device/service/DeviceMaintainService.java | 7 +- .../service/DeviceMaintainServiceImpl.java | 17 ++- .../service/DeviceUseRecordService.java | 2 +- .../service/DeviceUseRecordServiceImpl.java | 6 +- .../dal/mapper/DeviceMaintainMapper.xml | 100 +++++++----------- 12 files changed, 94 insertions(+), 110 deletions(-) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationMaintainVO.java diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java index 2a32ac27..80b97792 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceMaintainController.java @@ -1,10 +1,7 @@ package com.zt.plat.module.qms.resource.device.controller.admin; import com.alibaba.fastjson.JSONObject; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainPageReqVO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainRespVO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainSaveReqVO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainVO; +import com.zt.plat.module.qms.resource.device.controller.vo.*; import com.zt.plat.module.qms.resource.device.service.DeviceInfomationService; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; @@ -98,8 +95,8 @@ public class DeviceMaintainController extends AbstractFileUploadController imple @GetMapping("/queryPageListWithCount") @Operation(summary = "维护-分页列表查询（以设备为主数据）") - public CommonResult> queryPageListWithCount(@Valid DeviceMaintainPageReqVO pageReqVO) { - PageResult pageResult = deviceMaintainService.queryPageListWithCount(pageReqVO); + public CommonResult> queryPageListWithCount(@Valid DeviceMaintainPageReqVO pageReqVO) { + PageResult pageResult = deviceMaintainService.queryPageListWithCount(pageReqVO); return success(pageResult); } 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 2e74df2b..5316e5b7 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); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationMaintainVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationMaintainVO.java new file mode 100644 index 00000000..8f299007 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationMaintainVO.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 DeviceInfomationMaintainVO 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/DeviceMaintainVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainVO.java index 8ee21d8f..da5745f4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceMaintainVO.java @@ -43,28 +43,12 @@ public class DeviceMaintainVO extends DeviceMaintainRespVO { @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 String deviceStatus; @Schema(description = "使用中状态") private Integer inUseFlag; - @Schema(description = "验收状态") - private String acceptFlag; - - //============维护信息字段============ @Schema(description = "维护项目列表") List maintainItemList; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceMaintainMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceMaintainMapper.java index 56fcf801..ebc9929b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceMaintainMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceMaintainMapper.java @@ -5,9 +5,8 @@ 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.DeviceMaintainVO; +import com.zt.plat.module.qms.resource.device.controller.vo.*; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceMaintainDO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainPageReqVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,7 +39,9 @@ public interface DeviceMaintainMapper extends BaseMapperX { .orderByDesc(DeviceMaintainDO::getId)); } - IPage queryPageListWithCount(Page page, @Param("param") DeviceMaintainPageReqVO param); - DeviceMaintainVO queryVoById(@Param("id") Long id); +// IPage queryPageListWithCount(Page page, @Param("param") DeviceMaintainPageReqVO param); +// DeviceMaintainVO queryVoById(@Param("id") Long id); + + IPage queryPageListWithCount(Page page, @Param("param") DeviceMaintainPageReqVO param); } \ 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/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 9c82c9de..7d6b26e3 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,6 +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.DeviceInfomationUseRecordVO; 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; @@ -45,7 +46,7 @@ public interface DeviceUseRecordMapper extends BaseMapperX { return selectPage(reqVO, query); } - IPage queryPageListWithCount(Page page, @Param("param") DeviceUseRecordPageReqVO param); + IPage queryPageListWithCount(Page page, @Param("param") DeviceUseRecordPageReqVO param); // DeviceUseRecordVO queryVoById(@Param("id") Long id); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java index d276fc44..4c78a785 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java @@ -60,6 +60,8 @@ public class DeviceConfigBusinessRuleServiceImpl implements DeviceConfigBusiness if(!ObjectUtils.isEmpty(path)){ String[] split = path.split("/"); for (String s : split) { + if(ObjectUtils.isEmpty(s)) + continue; String id = s.replaceAll("/", ""); if(id.equals("0")) continue; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainService.java index 3e234854..ad0eed78 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainService.java @@ -5,10 +5,7 @@ import java.time.LocalDate; import java.util.*; import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainPageReqVO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainRespVO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainSaveReqVO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainVO; +import com.zt.plat.module.qms.resource.device.controller.vo.*; import jakarta.validation.*; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceMaintainDO; import com.zt.plat.framework.common.pojo.PageResult; @@ -26,7 +23,7 @@ public interface DeviceMaintainService { CommonResult create(Long deviceId, LocalDate lastDate, String dataType); - PageResult queryPageListWithCount(DeviceMaintainPageReqVO pageReqVO); + PageResult queryPageListWithCount(DeviceMaintainPageReqVO pageReqVO); CommonResult getMaintainDetail(Long id); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainServiceImpl.java index 3941dcca..421ff3a7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceMaintainServiceImpl.java @@ -9,10 +9,7 @@ import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; import com.zt.plat.module.qms.resource.device.common.DeviceUtil; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainPageReqVO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainRespVO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainSaveReqVO; -import com.zt.plat.module.qms.resource.device.controller.vo.DeviceMaintainVO; +import com.zt.plat.module.qms.resource.device.controller.vo.*; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceConfigBusinessRuleDO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceMaintainItemDO; import org.springframework.beans.factory.annotation.Autowired; @@ -131,9 +128,11 @@ public class DeviceMaintainServiceImpl implements DeviceMaintainService { @Override public CommonResult getMaintainDetail(Long id) { - DeviceMaintainVO vo = deviceMaintainMapper.queryVoById( id); - if(vo == null) + DeviceMaintainDO entity = deviceMaintainMapper.selectById( id); + if(entity == null) throw exception(DEVICE_MAINTAIN_NOT_EXISTS); + DeviceMaintainVO vo = new DeviceMaintainVO(); + BeanUtils.copyProperties(entity, vo); List itemList = deviceMaintainItemService.getListByParId( id); vo.setMaintainItemList(itemList); return CommonResult.success( vo); @@ -155,7 +154,7 @@ public class DeviceMaintainServiceImpl implements DeviceMaintainService { } @Override - public PageResult queryPageListWithCount(DeviceMaintainPageReqVO reqVO) { + public PageResult queryPageListWithCount(DeviceMaintainPageReqVO reqVO) { Long productId = reqVO.getProductId(); if(productId != null){ List productIds = deviceProductService.getIdListByIdPath(productId); @@ -165,9 +164,9 @@ public class DeviceMaintainServiceImpl implements DeviceMaintainService { reqVO.setDeviceIdList(deviceIds); } } - Page page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize()); + Page page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize()); - IPage pageList = deviceMaintainMapper.queryPageListWithCount(page, reqVO); + IPage pageList = deviceMaintainMapper.queryPageListWithCount(page, reqVO); return new PageResult<>(pageList.getRecords(), pageList.getTotal()); } 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 1d5be525..9b12e1c7 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 d29241fb..268bed95 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 @@ -41,7 +41,7 @@ public class DeviceUseRecordServiceImpl implements DeviceUseRecordService { @Resource private DeviceUseRecordDetailService deviceUseRecordDetailService; @Override - public PageResult queryPageListWithCount(DeviceUseRecordPageReqVO reqVO) { + public PageResult queryPageListWithCount(DeviceUseRecordPageReqVO reqVO) { Long productId = reqVO.getProductId(); if(productId != null){ List productIds = deviceProductService.getIdListByIdPath(productId); @@ -51,8 +51,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/DeviceMaintainMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceMaintainMapper.xml index c53382e3..fcd2abf6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceMaintainMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceMaintainMapper.xml @@ -2,78 +2,56 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + - - - d.DEV_NAME, - d.ALS, - d.DEV_CD, - d.FACT_CD, - d.DEPT_NAME, - d.RPR_FLG, - d.DMOT_FLG, - d.SCR_FLG, - d.DSBL_FLG, - d.LND_FLG, - d.IN_USE_FLG, - d.ACPT_FLG, - p.ID as PRODUCT_ID, + - select m.*, - - from T_DEV_MATN m - left join T_DEV_INF d on m.DEV_ID = d.id - left join T_DEV_PDT p on d.PDT_ID = p.id - - and m.ID = #{id} - - - - -