From c6bdd36a429d42ce2f349f16615af8aff8d92ed3 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 26 Apr 2024 14:15:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E3=80=81=E8=AE=BE=E5=A4=87=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dev/DeviceInfoController.java | 8 +-- .../glxp/api/dao/dev/DeviceInfoMapper.java | 3 + .../dev/DeviceInfoDetailByDeptCodeQuery.java | 62 +++++++++++++++++++ .../api/req/dev/DeviceInfoDetailQuery.java | 17 +++++ .../api/service/dev/DeviceInfoService.java | 3 + .../dev/impl/DeviceInfoServiceImpl.java | 9 +++ .../mapper/dev/DeviceChangeOrderMapper.xml | 32 +++++----- .../mybatis/mapper/dev/DeviceInfoMapper.xml | 9 +++ 8 files changed, 121 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java index 8273fe639..36979dd5b 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java @@ -17,10 +17,7 @@ import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.dev.DeviceInfoDetailQuery; -import com.glxp.api.req.dev.DeviceInfoQuery; -import com.glxp.api.req.dev.FilterDeptDeviceRequest; -import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest; +import com.glxp.api.req.dev.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.dev.DeptDeviceDetailResponse; import com.glxp.api.service.dev.DeviceChangeLogService; @@ -152,8 +149,7 @@ public class DeviceInfoController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/udi/device/info/detailByDeptCode/page") - public BaseResponse detailByDeptCode(@RequestBody @Valid DeviceInfoDetailQuery query) { - AuthAdmin user = super.getUser(); + public BaseResponse detailByDeptCode(@RequestBody @Valid DeviceInfoDetailByDeptCodeQuery query) { List list = deviceInfoService.detail(query); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse page = new PageSimpleResponse(); diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java index bb0bd6bd3..db306c9dc 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java @@ -3,6 +3,7 @@ package com.glxp.api.dao.dev; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.enums.dev.DeviceStatusEnum; +import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery; import com.glxp.api.req.dev.DeviceInfoDetailQuery; import com.glxp.api.req.dev.DeviceInfoQuery; import com.glxp.api.vo.dev.DeviceInfoVo; @@ -22,6 +23,8 @@ public interface DeviceInfoMapper extends BaseMapper { List detail(@Param("param") DeviceInfoDetailQuery query); + List detail(@Param("param") DeviceInfoDetailByDeptCodeQuery query); + List listVoByProductIdAndStatus(@Param("productId")Long productId, @Param("status")DeviceStatusEnum status); List listVoByCodes(@Param("list") List deviceCodes,@Param("deptCode") String deptCode,@Param("status") DeviceStatusEnum status); diff --git a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java new file mode 100644 index 000000000..989d773ce --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java @@ -0,0 +1,62 @@ +package com.glxp.api.req.dev; + +import com.glxp.api.enums.dev.DeviceStatusEnum; +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +public class DeviceInfoDetailByDeptCodeQuery extends ListPageRequest { + /** + * 部门编码 + */ + @NotBlank(message = "缺少部门编码") + private String deptCode; + + /** + * 设备状态 + */ + private DeviceStatusEnum status; + + /** + * 设备编码 + */ + private String deviceCode; + + /** + * 最小销售标识 + */ + private String nameCode; + + + /** + * 设备名称 + */ + private String productName; + + /** + * 生产企业 + */ + private String manufactory; + + /** + * 注册/备案号 + */ + private String zczbhhzbapzbh; + + private String productId; + + private Boolean checkLock; + /** + * 计划id + */ + private Long planId; + + /** + * 模版ID + */ + + private Integer labelId; +} diff --git a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java index 17266ec1c..007ccdd7f 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java @@ -51,4 +51,21 @@ public class DeviceInfoDetailQuery extends ListPageRequest { private Integer labelId; + /** + * 最小销售标识 + */ + private String nameCode; + + + /** + * 生产企业 + */ + private String manufactory; + + /** + * 注册/备案号 + */ + private String zczbhhzbapzbh; + + } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java index cd2d6acc0..012cb94e9 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java @@ -4,6 +4,7 @@ import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.enums.dev.DeviceStatusEnum; +import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery; import com.glxp.api.req.dev.DeviceInfoDetailQuery; import com.glxp.api.req.dev.DeviceInfoQuery; import com.glxp.api.vo.dev.DeviceInfoVo; @@ -91,6 +92,8 @@ public interface DeviceInfoService extends IService { List detail(DeviceInfoDetailQuery query); + List detail(DeviceInfoDetailByDeptCodeQuery query); + List listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status); List listVoByCodes(List deviceCodes, String deptCode, DeviceStatusEnum status); diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java index c2dbd6de1..dc9b08b83 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java @@ -8,6 +8,7 @@ import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.exception.JsonException; +import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery; import com.glxp.api.req.dev.DeviceInfoDetailQuery; import com.glxp.api.req.dev.DeviceInfoQuery; import com.glxp.api.service.dev.DeviceInfoService; @@ -158,6 +159,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl detail(DeviceInfoDetailByDeptCodeQuery query) { + if (query.getPage() != null) { + PageHelper.startPage(query.getPage(), query.getLimit()); + } + return super.baseMapper.detail(query); + } + @Override public List listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status) { diff --git a/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml index 51bbd055d..d75d004db 100644 --- a/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml @@ -63,8 +63,8 @@ diff --git a/src/main/resources/mybatis/mapper/dev/DeviceInfoMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceInfoMapper.xml index 2f98e2ce0..a488af12c 100644 --- a/src/main/resources/mybatis/mapper/dev/DeviceInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceInfoMapper.xml @@ -74,6 +74,15 @@ and info.checkLock = #{param.checkLock} + + and info.manufactory like concat('%',#{param.manufactory},'%') + + + and info.zczbhhzbapzbh like concat('%',#{param.zczbhhzbapzbh},'%') + + + and info.nameCode like concat('%',#{param.nameCode},'%') + and info.productName like concat('%',#{param.productName},'%')