From a5ddecac51206a15e7b4b405b1b270ea46a96e8e Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 17 May 2024 18:19:27 +0800 Subject: [PATCH] =?UTF-8?q?5/17=20=E4=BF=9D=E5=85=BB=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=89=8D=E7=AB=AF=20=E5=B7=A1=E6=A3=80/?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE/=E4=BF=9D=E5=85=BB=20=E8=AE=B0=E5=BD=95=20?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B2=A1=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/DeviceCheckDetailController.java | 30 +++++++++-- .../dev/DeviceUpkeepController.java | 53 +++++++++++++------ .../dev/DeviceUpkeepDetailController.java | 14 ++++- .../api/dao/dev/DeviceCheckDetailMapper.java | 5 ++ .../glxp/api/dao/dev/DeviceUpkeepMapper.java | 3 ++ .../glxp/api/req/dev/CheckDetailQuery.java | 14 +++++ .../req/dev/DeviceRepairApplyAddParam.java | 1 + .../req/dev/DeviceUpkeepDetailItemQuery.java | 2 +- .../api/req/dev/DeviceUpkeepDetailParam.java | 35 ++++++++++++ .../glxp/api/req/dev/DeviceUpkeepQuery.java | 1 + .../service/dev/DeviceCheckDetailService.java | 3 ++ .../dev/DeviceUpkeepDetailItemService.java | 2 + .../api/service/dev/DeviceUpkeepService.java | 7 ++- .../impl/DeviceCheckDetailServiceImpl.java | 16 ++++-- .../DeviceUpkeepDetailItemServiceImpl.java | 52 +++++++++++++++++- .../dev/impl/DeviceUpkeepServiceImpl.java | 11 +++- .../glxp/api/vo/dev/DeviceCheckDetailVo.java | 21 ++++++++ .../glxp/api/vo/dev/DeviceUpkeepDetailVo.java | 20 +++++++ .../mapper/dev/DeviceCheckDetailMapper.xml | 9 ++++ .../mybatis/mapper/dev/DeviceUpkeepMapper.xml | 8 +++ 20 files changed, 274 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java create mode 100644 src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailParam.java create mode 100644 src/main/java/com/glxp/api/vo/dev/DeviceCheckDetailVo.java create mode 100644 src/main/java/com/glxp/api/vo/dev/DeviceUpkeepDetailVo.java diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java index 624c5c1c2..e7560eba0 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java @@ -1,5 +1,9 @@ package com.glxp.api.controller.dev; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; @@ -7,13 +11,13 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; -import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam; -import com.glxp.api.req.dev.DeviceCheckDetailParam; -import com.glxp.api.req.dev.DeviceCheckDetailQuery; -import com.glxp.api.req.dev.DeviceCheckDetailRepairParam; +import com.glxp.api.entity.dev.DevicePlanDetailEntity; +import com.glxp.api.req.dev.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.DeviceCheckDetailItemService; import com.glxp.api.service.dev.DeviceCheckDetailService; +import com.glxp.api.vo.dev.DeviceCheckDetailVo; +import com.glxp.api.vo.dev.DeviceUpkeepDetailVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -75,5 +79,23 @@ public class DeviceCheckDetailController extends BaseController { return ResultVOUtils.successMsg("操作成功"); } + /** + * 根据device Code 查询巡检记录 /udi/device/check/info/print/" + * + * @param + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/udi/device/check/detail/record") + public BaseResponse filterDeviceCheck(@RequestBody @Valid CheckDetailQuery query) { + AuthAdmin user = super.getUser(); + List list = deviceCheckDetailService.pageListDetail(query); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse page = new PageSimpleResponse(); + page.setTotal(pageInfo.getTotal()); + page.setList(pageInfo.getList()); + return ResultVOUtils.success(page); + } + } diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java index 0df53131f..639289a96 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepController.java @@ -6,12 +6,13 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.dev.DeviceRepairEntity; +import com.glxp.api.req.dev.DeviceCheckQuery; +import com.glxp.api.req.dev.DeviceRepairQuery; import com.glxp.api.req.dev.DeviceUpkeepQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.dev.DeviceUpkeepService; -import com.glxp.api.vo.dev.DeviceCheckPrintVo; -import com.glxp.api.vo.dev.DeviceUpkeepPrintVo; -import com.glxp.api.vo.dev.DeviceUpkeepVo; +import com.glxp.api.vo.dev.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -44,23 +45,23 @@ public class DeviceUpkeepController extends BaseController { } /** - * 本部门巡检任务单列表 + * 本部门任务单列表 * * @param query * @return // */ -// @AuthRuleAnnotation("") -// @PostMapping("/udi/device/check/pageByDept") -// public BaseResponse pageByDept(@RequestBody DeviceCheckQuery query) { -// AuthAdmin user = super.getUser(); -// query.setChargeDeptCode(user.getLocDeptCode()); -// List list = deviceCheckService.pageList(query); -// PageInfo pageInfo = new PageInfo<>(list); -// PageSimpleResponse page = new PageSimpleResponse(); -// page.setTotal(pageInfo.getTotal()); -// page.setList(pageInfo.getList()); -// return ResultVOUtils.success(page); -// } + @AuthRuleAnnotation("") + @PostMapping("/udi/device/upkeep/pageByDept") + public BaseResponse pageByDept(@RequestBody DeviceUpkeepQuery query) { + AuthAdmin user = super.getUser(); + query.setChargeDeptCode(user.getLocDeptCode()); + List list = deviceUpkeepService.pageList(query); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse page = new PageSimpleResponse(); + page.setTotal(pageInfo.getTotal()); + page.setList(pageInfo.getList()); + return ResultVOUtils.success(page); + } /** * 根据计划id生成巡检任务单 @@ -90,4 +91,24 @@ public class DeviceUpkeepController extends BaseController { return ResultVOUtils.success(vo); } + + /** + * 我的维修单 + * + * @param query + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/udi/device/upkeep/byUser/page") + public BaseResponse pageByUser(@RequestBody DeviceUpkeepQuery query) { + AuthAdmin user = super.getUser(); + query.setChargeDeptCode(user.getLocDeptCode()); + List list = deviceUpkeepService.pageListDetail(query); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse page = new PageSimpleResponse(); + page.setTotal(pageInfo.getTotal()); + page.setList(pageInfo.getList()); + return ResultVOUtils.success(page); + } + } diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java index 6cb4e46d0..23b6d52de 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java @@ -79,7 +79,19 @@ public class DeviceUpkeepDetailController extends BaseController { return ResultVOUtils.success(entity); } - + /** + * 完成保养任务单明细项目 + * + * @param param + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/udi/device/upkeep/detail/finish") + public BaseResponse finish(@RequestBody @Valid DeviceUpkeepDetailParam param) { + AuthAdmin user = super.getUser(); + deviceUpkeepDetailItemService.finishAll(param, user); + return ResultVOUtils.successMsg("操作成功"); + } diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java index 587c5c6db..944036801 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java @@ -3,11 +3,16 @@ package com.glxp.api.dao.dev; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.req.dev.CheckDetailQuery; +import com.glxp.api.vo.dev.DeviceCheckDetailVo; + +import java.util.List; /** * 针对表【device_check_detail(巡检任务明细)】的数据库操作Mapper */ public interface DeviceCheckDetailMapper extends BaseMapperPlus { + List pageListDetail(CheckDetailQuery query); } diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java index 00e118328..388268766 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceUpkeepMapper.java @@ -6,6 +6,7 @@ import com.glxp.api.entity.dev.DeviceUpkeepEntity; import com.glxp.api.req.dev.DeviceCheckQuery; import com.glxp.api.req.dev.DeviceUpkeepQuery; import com.glxp.api.vo.dev.DeviceCheckVo; +import com.glxp.api.vo.dev.DeviceUpkeepDetailVo; import com.glxp.api.vo.dev.DeviceUpkeepVo; import org.apache.ibatis.annotations.Param; @@ -20,6 +21,8 @@ public interface DeviceUpkeepMapper extends BaseMapperPlus pageListDetail(DeviceUpkeepQuery query); } diff --git a/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java b/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java new file mode 100644 index 000000000..53a1fe0f6 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/CheckDetailQuery.java @@ -0,0 +1,14 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class CheckDetailQuery extends ListPageRequest { + + private String deviceCode; + + +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java index 7da4abd2e..3decd50a9 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java @@ -80,6 +80,7 @@ public class DeviceRepairApplyAddParam { .applyUserId(user.getId()) .applyUserName(user.getEmployeeName()) .applyUserPhone(this.applyUserPhone) + .confirmUserId(user.getId()) .applyTime(LocalDateTime.now()) .deviceCount(details.size()) .finishCount(0) diff --git a/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java index f36aa8b9b..fc2546b75 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailItemQuery.java @@ -16,7 +16,7 @@ public class DeviceUpkeepDetailItemQuery extends ListPageRequest { /** * 设备标识 */ - @NotBlank(message = "设备标识不能为空") +// @NotBlank(message = "设备标识不能为空") private String deviceCode; diff --git a/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailParam.java b/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailParam.java new file mode 100644 index 000000000..c338ebd86 --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/DeviceUpkeepDetailParam.java @@ -0,0 +1,35 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.entity.dev.DeviceUpkeepDetailItemEntity; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class DeviceUpkeepDetailParam { + + @NotNull(message = "任务单标识不能为空") + private Long taskId; + + @NotBlank(message = "设备编码不能为空") + private String deviceCode; + + /** + * 保养建议 + */ + private String suggestion; + + /** + * 现场照片 + */ + private String livePath; + /** + * 正常标识 + */ + private Boolean normalFlag; + + private List detailItemEntities; + +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceUpkeepQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceUpkeepQuery.java index 32adad689..eb609a6e0 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceUpkeepQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceUpkeepQuery.java @@ -8,6 +8,7 @@ public class DeviceUpkeepQuery extends ListPageRequest { String taskId; String chargeDeptCode; + String deviceCode; Boolean finishFlag; } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailService.java index 482d72bc7..120c21baf 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceCheckDetailService.java @@ -3,9 +3,11 @@ package com.glxp.api.service.dev; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceCheckDetailEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.req.dev.CheckDetailQuery; import com.glxp.api.req.dev.DeviceCheckDetailParam; import com.glxp.api.req.dev.DeviceCheckDetailQuery; import com.glxp.api.req.dev.DeviceCheckDetailRepairParam; +import com.glxp.api.vo.dev.DeviceCheckDetailVo; import java.util.List; @@ -32,4 +34,5 @@ public interface DeviceCheckDetailService extends IService pageListDetail(CheckDetailQuery query); } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailItemService.java b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailItemService.java index 1477ece9b..78edf6384 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailItemService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailItemService.java @@ -19,4 +19,6 @@ public interface DeviceUpkeepDetailItemService extends IService pageList(DeviceUpkeepDetailItemQuery query); void finish(DeviceUpkeepDetailItemFinishParam param, AuthAdmin user); + + void finishAll(DeviceUpkeepDetailParam param, AuthAdmin user); } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java index 41e183afd..5d6971249 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceUpkeepEntity; import com.glxp.api.req.dev.DeviceUpkeepQuery; -import com.glxp.api.vo.dev.DeviceCheckPrintVo; -import com.glxp.api.vo.dev.DeviceCheckVo; -import com.glxp.api.vo.dev.DeviceUpkeepPrintVo; -import com.glxp.api.vo.dev.DeviceUpkeepVo; +import com.glxp.api.vo.dev.*; import java.util.List; @@ -32,6 +29,8 @@ public interface DeviceUpkeepService extends IService { void finishUpkeep(Long taskId, String deviceCode); + List pageListDetail(DeviceUpkeepQuery query); + /** * 完成一个保养设备 * diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailServiceImpl.java index 948ef7033..c2add6dfc 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailServiceImpl.java @@ -12,14 +12,13 @@ import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity; import com.glxp.api.entity.dev.DeviceRepairEntity; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam; -import com.glxp.api.req.dev.DeviceCheckDetailParam; -import com.glxp.api.req.dev.DeviceCheckDetailQuery; -import com.glxp.api.req.dev.DeviceCheckDetailRepairParam; +import com.glxp.api.req.dev.*; import com.glxp.api.service.dev.*; import com.glxp.api.dao.dev.DeviceCheckDetailMapper; import com.glxp.api.util.IntUtil; import com.glxp.api.util.SnowflakeUtil; +import com.glxp.api.vo.dev.DeviceCheckDetailVo; +import com.glxp.api.vo.dev.DeviceUpkeepDetailVo; import groovy.util.logging.Slf4j; import lombok.RequiredArgsConstructor; import org.apache.poi.ss.formula.functions.Now; @@ -144,6 +143,15 @@ public class DeviceCheckDetailServiceImpl extends ServiceImpl pageListDetail(CheckDetailQuery query) { + if (query.getPage() != null){ + PageHelper.startPage(query.getPage(),query.getLimit()); + } + List list = super.baseMapper.pageListDetail(query); + return list; + } } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java index 2d59d582e..44878aa21 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java @@ -1,14 +1,19 @@ package com.glxp.api.service.dev.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.dao.dev.DeviceCheckDetailMapper; import com.glxp.api.dao.dev.DeviceUpkeepDetailItemMapper; +import com.glxp.api.dao.dev.DeviceUpkeepDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.*; import com.glxp.api.exception.JsonException; import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam; import com.glxp.api.req.dev.DeviceUpkeepDetailItemFinishParam; import com.glxp.api.req.dev.DeviceUpkeepDetailItemQuery; +import com.glxp.api.req.dev.DeviceUpkeepDetailParam; import com.glxp.api.service.dev.DeviceUpkeepDetailItemService; import com.glxp.api.service.dev.DeviceUpkeepDetailService; import com.glxp.api.service.dev.DeviceUpkeepService; @@ -34,6 +39,8 @@ public class DeviceUpkeepDetailItemServiceImpl extends ServiceImpl pageList(DeviceUpkeepDetailItemQuery query) { List list = super.list(Wrappers.lambdaQuery(DeviceUpkeepDetailItemEntity.class) .eq(DeviceUpkeepDetailItemEntity::getTaskId, query.getTaskId()) - .eq(DeviceUpkeepDetailItemEntity::getDeviceCode, query.getDeviceCode()) + .eq(query.getDeviceCode()!=null,DeviceUpkeepDetailItemEntity::getDeviceCode, query.getDeviceCode()) .orderByAsc(DeviceUpkeepDetailItemEntity::getFinishFlag, DeviceUpkeepDetailItemEntity::getNormalFlag, DeviceUpkeepDetailItemEntity::getDeviceCode, DeviceUpkeepDetailItemEntity::getItemCode) ); @@ -91,6 +98,49 @@ public class DeviceUpkeepDetailItemServiceImpl extends ServiceImpl0 from device_check_detail where taskId = %s and deviceCode = '%s')", taskId, deviceCode)) + .setSql(String.format("exceptionCount = exceptionCount + (select exceptionCount>0 from device_upkeep_detail where taskId = %s and deviceCode = '%s')", taskId, deviceCode)) .eq(DeviceUpkeepEntity::getTaskId, taskId) .last("and finishCount+1 <= deviceCount") ); @@ -209,7 +209,14 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl pageListDetail(DeviceUpkeepQuery query) { + if (query.getPage() != null){ + PageHelper.startPage(query.getPage(),query.getLimit()); + } + List list = super.baseMapper.pageListDetail(query); + return list; + } } diff --git a/src/main/java/com/glxp/api/vo/dev/DeviceCheckDetailVo.java b/src/main/java/com/glxp/api/vo/dev/DeviceCheckDetailVo.java new file mode 100644 index 000000000..9057caf3a --- /dev/null +++ b/src/main/java/com/glxp/api/vo/dev/DeviceCheckDetailVo.java @@ -0,0 +1,21 @@ +package com.glxp.api.vo.dev; + +import io.swagger.models.auth.In; +import lombok.Data; + +@Data +public class DeviceCheckDetailVo { + + String deviceCode; + String productName; + Integer itemCount; + Integer normalFlag; + Integer finishCount; + Integer exceptionCount; + String itemName; + String suggestion; + + + + +} diff --git a/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepDetailVo.java b/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepDetailVo.java new file mode 100644 index 000000000..8ce0f39c6 --- /dev/null +++ b/src/main/java/com/glxp/api/vo/dev/DeviceUpkeepDetailVo.java @@ -0,0 +1,20 @@ +package com.glxp.api.vo.dev; + +import com.glxp.api.entity.dev.DeviceUpkeepEntity; +import lombok.Data; + +@Data +public class DeviceUpkeepDetailVo { + + String deviceCode; + String deptName; + Boolean finishFlag; + String manufactory; + Integer itemCount; + Integer exceptionCount; + Integer finishCount; + Integer deviceCount; + String createUserName; + + +} diff --git a/src/main/resources/mybatis/mapper/dev/DeviceCheckDetailMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceCheckDetailMapper.xml index d207383e2..5e22fc4e2 100644 --- a/src/main/resources/mybatis/mapper/dev/DeviceCheckDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceCheckDetailMapper.xml @@ -3,4 +3,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + diff --git a/src/main/resources/mybatis/mapper/dev/DeviceUpkeepMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceUpkeepMapper.xml index f915694e1..2df51e8ce 100644 --- a/src/main/resources/mybatis/mapper/dev/DeviceUpkeepMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceUpkeepMapper.xml @@ -49,4 +49,12 @@ left join auth_dept d on d.code = u.chargeDeptCode where u.taskId = #{taskId} +