From 6ce835f1188ba3079f2d333590516cd765830178 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 1 Dec 2022 10:40:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=9D=E5=AD=98=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/admin/constant/Constant.java | 10 ++++ .../dao/inventory/DeviceCollectOrderDao.java | 15 +++++ .../DeviceCollectOrderDetailDao.java | 4 ++ .../inventory/DeviceCollectOrderEntity.java | 2 +- .../FilterDeviceCollectOrderRequest.java | 3 +- .../inventory/DeviceCollectOrderResponse.java | 6 ++ .../impl/DeviceCollectOrderServiceImpl.java | 57 +++++++++++++++++-- .../inventory/DeviceCollectOrderDao.xml | 30 ++++++++-- .../inventory/DeviceCollectOrderDetailDao.xml | 7 +++ 9 files changed, 123 insertions(+), 11 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java b/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java index 0723bf83..9c0fdaa8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java @@ -27,6 +27,16 @@ public class Constant { */ public static final String MA_ORDER = "MA"; + /** + * 设备领用记录前缀 + */ + public static final String DEVICE_COLLECT_ORDER = "DCO"; + + /** + * 设备养护记录前缀 + */ + public static final String DEVICE_MA_ORDER = "DMA"; + public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS"; public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS"; public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS"; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java index 812cbe1d..cf66ef5a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java @@ -1,6 +1,11 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity; +import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest; +import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface DeviceCollectOrderDao { int deleteByPrimaryKey(Integer id); @@ -14,4 +19,14 @@ public interface DeviceCollectOrderDao { int updateByPrimaryKeySelective(DeviceCollectOrderEntity record); int updateByPrimaryKey(DeviceCollectOrderEntity record); + + List filterList(FilterDeviceCollectOrderRequest deviceCollectOrderRequest); + + /** + * 根据ID查询领用记录号 + * + * @param id + * @return + */ + String selectOrderIdById(@Param("id") Integer id); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java index 92353490..c175569c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java @@ -2,6 +2,8 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; +import java.util.List; + public interface DeviceCollectOrderDetailDao { int deleteByPrimaryKey(Integer id); @@ -14,4 +16,6 @@ public interface DeviceCollectOrderDetailDao { int updateByPrimaryKeySelective(DeviceCollectOrderDetailEntity record); int updateByPrimaryKey(DeviceCollectOrderDetailEntity record); + + List selectByOrderId(String orderId); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java index 9a054c94..eaf9c77a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java @@ -45,5 +45,5 @@ public class DeviceCollectOrderEntity { /** * 状态 0：草稿 1：未审核 2：已审核 */ - private Boolean status; + private Integer status; } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderRequest.java index f882172d..d968164d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderRequest.java @@ -1,12 +1,13 @@ package com.glxp.api.admin.req.inventory; +import com.glxp.api.admin.req.ListPageRequest; import lombok.Data; /** * 设备领用记录相关参数 */ @Data -public class FilterDeviceCollectOrderRequest { +public class FilterDeviceCollectOrderRequest extends ListPageRequest { /** * 设备领用记录ID diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderResponse.java index 81b5640d..94829343 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderResponse.java @@ -8,4 +8,10 @@ import lombok.Data; */ @Data public class DeviceCollectOrderResponse extends DeviceCollectOrderEntity { + + /** + * 领用部门 + */ + private String deptName; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java index 86c274dc..47a65131 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java @@ -1,17 +1,29 @@ package com.glxp.api.admin.service.inventory.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDao; import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDetailDao; +import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity; import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest; import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse; +import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.inventory.DeviceCollectOrderService; +import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.admin.util.GennerOrderUtils; +import com.glxp.api.admin.util.OrderNoTypeBean; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; @Slf4j @@ -23,25 +35,62 @@ public class DeviceCollectOrderServiceImpl implements DeviceCollectOrderService private DeviceCollectOrderDao deviceCollectOrderDao; @Resource private DeviceCollectOrderDetailDao deviceCollectOrderDetailDao; + @Resource + private GennerOrderUtils gennerOrderUtils; + @Resource + private CustomerService customerService; @Override public List filterList(FilterDeviceCollectOrderRequest deviceCollectOrderRequest) { - return null; + if (null == deviceCollectOrderRequest) { + return Collections.emptyList(); + } + if (null != deviceCollectOrderRequest.getPage() && null != deviceCollectOrderRequest.getLimit()) { + PageHelper.offsetPage((deviceCollectOrderRequest.getPage() - 1) * deviceCollectOrderRequest.getLimit(), deviceCollectOrderRequest.getLimit()); + } + return deviceCollectOrderDao.filterList(deviceCollectOrderRequest); } @Override public BaseResponse addDeviceCollectOrder(DeviceCollectOrderEntity deviceCollectOrderEntity) { - return null; + if (null == deviceCollectOrderEntity) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + //生成单号 + String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_COLLECT_ORDER, "yyyyMMdd")); + deviceCollectOrderEntity.setOrderId(orderId); + deviceCollectOrderEntity.setCreateTime(DateUtil.getDateTime()); + deviceCollectOrderEntity.setStatus(0); + deviceCollectOrderEntity.setUpdateTime(DateUtil.getDateTime()); + String userName = customerService.getUserBean().getUserName(); + deviceCollectOrderEntity.setCreateUser(userName); + deviceCollectOrderDao.insert(deviceCollectOrderEntity); + return ResultVOUtils.success(deviceCollectOrderEntity); } @Override public BaseResponse updateDeviceCollectOrder(DeviceCollectOrderEntity deviceCollectOrderEntity) { - return null; + if (null == deviceCollectOrderEntity || null == deviceCollectOrderEntity.getId() || StrUtil.isBlank(deviceCollectOrderEntity.getOrderId())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + deviceCollectOrderEntity.setUpdateTime(DateUtil.getDateTime()); + deviceCollectOrderDao.updateByPrimaryKey(deviceCollectOrderEntity); + return ResultVOUtils.success("更新成功"); } @Override public BaseResponse submitAudit(Integer id) { - return null; + if (null == id) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + //查询设备领用记录详情，判断是否每个设备都可以分辨唯一，如果不能，则无法提交审核 + String orderId = deviceCollectOrderDao.selectOrderIdById(id); + List detailList = deviceCollectOrderDetailDao.selectByOrderId(orderId); + if (CollUtil.isEmpty(detailList)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请添加领用设备！"); + } + + return ResultVOUtils.success("提交成功！"); } @Override diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml index 3ec3fccc..cc45d63e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml @@ -9,7 +9,7 @@ - + @@ -43,7 +43,7 @@ `status`) values (#{orderId,jdbcType=VARCHAR}, #{deptCode,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{auditUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}, - #{status,jdbcType=BOOLEAN}) + #{status,jdbcType=INTEGER}) - #{status,jdbcType=BOOLEAN}, + #{status,jdbcType=INTEGER}, @@ -120,7 +120,7 @@ updateTime = #{updateTime,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=BOOLEAN}, + `status` = #{status,jdbcType=INTEGER}, where id = #{id,jdbcType=INTEGER} @@ -134,7 +134,27 @@ auditUser = #{auditUser,jdbcType=VARCHAR}, createTime = #{createTime,jdbcType=VARCHAR}, updateTime = #{updateTime,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=BOOLEAN} + `status` = #{status,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml index 82016b41..2b4c4ad4 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml @@ -243,4 +243,11 @@ receiveSpaceCode = #{receiveSpaceCode,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file