新增设备发货管理列表

sop-api/src/main/java/com/qmth/sop/server/api/TBDeviceDeliveryController.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -121,4 +122,13 @@ public class TBDeviceDeliveryController {
         }
         return ResultUtil.ok(true);
     }
+
+    @ApiOperation(value = "设备发货导入")
+    @RequestMapping(value = "/import", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
+    @OperationLog(logType = LogTypeEnum.IMPORT)
+    public Result importDeviceDelivery(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
+        tbDeviceDeliveryService.deviceDeliveryImport(file);
+        return ResultUtil.ok();
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/service/TBDeviceDeliveryService.java

@@ -1,11 +1,16 @@
 package com.qmth.sop.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.sop.business.bean.params.DeviceDeliveryParam;
+import com.qmth.sop.business.bean.result.TBDeviceDeliveryResult;
 import com.qmth.sop.business.entity.TBDeviceDelivery;
+import com.qmth.sop.common.enums.DeviceDeliveryStatusEnum;
+import com.qmth.sop.common.enums.DeviceUsageTypeEnum;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * <p>
@@ -30,4 +35,24 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param deviceDeliveryParam 设备发货修改参数
      */
     void editDeviceDelivery(DeviceDeliveryParam deviceDeliveryParam);
+
+
+    /**
+     * 设备发货管理列表
+     *
+     * @param iPage
+     * @param serviceId
+     * @param usageType
+     * @param crmNo
+     * @param status
+     * @param deliverUserId
+     * @param crmStartTime
+     * @param crmEndTime
+     * @param serialNo
+     * @param supplierId
+     * @param receiveStartTime
+     * @param receiveEndTime
+     * @return
+     */
+    IPage<TBDeviceDeliveryResult> list(IPage<Map> iPage, Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long crmStartTime, Long crmEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

@@ -3,12 +3,15 @@ package com.qmth.sop.business.service.impl;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.sop.business.bean.dto.DeviceDeliveryImportDto;
 import com.qmth.sop.business.bean.dto.DeviceInfoDto;
 import com.qmth.sop.business.bean.params.DeviceDeliveryParam;
+import com.qmth.sop.business.bean.result.TBDeviceDeliveryResult;
 import com.qmth.sop.business.entity.SysDevice;
 import com.qmth.sop.business.entity.SysSupplier;
+import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBDeviceDelivery;
 import com.qmth.sop.business.mapper.TBDeviceDeliveryMapper;
 import com.qmth.sop.business.service.SysDeviceModelService;
@@ -18,6 +21,7 @@ import com.qmth.sop.business.service.TBDeviceDeliveryService;
 import com.qmth.sop.business.util.excel.BasicExcelListener;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.*;
+import com.qmth.sop.common.util.ServletUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +44,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMapper, TBDeviceDelivery> implements TBDeviceDeliveryService {
+
     @Resource
     private SysDeviceService sysDeviceService;
     @Resource
@@ -171,4 +176,27 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                 .set(TBDeviceDelivery::getConsigneePhone, consigneePhone)
                 .set(TBDeviceDelivery::getExpressNo, expressNo));
     }
+
+    /**
+     * 设备发货管理列表
+     *
+     * @param iPage
+     * @param serviceId
+     * @param usageType
+     * @param crmNo
+     * @param status
+     * @param deliverUserId
+     * @param crmStartTime
+     * @param crmEndTime
+     * @param serialNo
+     * @param supplierId
+     * @param receiveStartTime
+     * @param receiveEndTime
+     * @return
+     */
+    @Override
+    public IPage<TBDeviceDeliveryResult> list(IPage<Map> iPage, Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long crmStartTime, Long crmEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        return this.baseMapper.list(iPage, serviceId, Objects.nonNull(usageType) ? usageType.name() : null, crmNo, Objects.nonNull(status) ? status.name() : null, deliverUserId, crmStartTime, crmEndTime, serialNo, supplierId, receiveStartTime, receiveEndTime, sysUser.getId());
+    }
 }