fix: sop 设备发货管理

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

@@ -59,6 +59,7 @@ public class TBDeviceDeliveryController {
                        @ApiParam(value = "发货开始时间") @RequestParam(required = false) Long deliverStartTime,
                        @ApiParam(value = "发货结束时间") @RequestParam(required = false) Long deliverEndTime,
                        @ApiParam(value = "设备序列号") @RequestParam(required = false) String serialNo,
+                       @ApiParam(value = "设备编号") @RequestParam(required = false) String deviceNo,
                        @ApiParam(value = "供应商id") @RequestParam(required = false) String supplierId,
                        @ApiParam(value = "签收开始时间") @RequestParam(required = false) Long receiveStartTime,
                        @ApiParam(value = "签收结束时间") @RequestParam(required = false) Long receiveEndTime,
@@ -66,7 +67,7 @@ public class TBDeviceDeliveryController {
                        @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) throws Exception {
         return ResultUtil.ok(tbDeviceDeliveryService.page(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(serviceId),
                 usageType, crmNo, status, SystemConstant.convertIdToLong(deliverUserId), deliverStartTime, deliverEndTime,
-                serialNo, SystemConstant.convertIdToLong(supplierId), receiveStartTime, receiveEndTime));
+                serialNo, deviceNo, SystemConstant.convertIdToLong(supplierId), receiveStartTime, receiveEndTime));
     }
 
     @ApiOperation(value = "设备发货保存接口")
@@ -126,10 +127,11 @@ public class TBDeviceDeliveryController {
                          @ApiParam(value = "发货开始时间") @RequestParam(required = false) Long deliverStartTime,
                          @ApiParam(value = "发货结束时间") @RequestParam(required = false) Long deliverEndTime,
                          @ApiParam(value = "设备序列号") @RequestParam(required = false) String serialNo,
+                         @ApiParam(value = "设备编号") @RequestParam(required = false) String deviceNo,
                          @ApiParam(value = "供应商id") @RequestParam(required = false) Long supplierId,
                          @ApiParam(value = "签收开始时间") @RequestParam(required = false) Long receiveStartTime,
                          @ApiParam(value = "签收结束时间") @RequestParam(required = false) Long receiveEndTime) throws Exception {
-        tbDeviceDeliveryService.dataExport(serviceId, usageType, crmNo, status, deliverUserId, deliverStartTime, deliverEndTime, serialNo, supplierId, receiveStartTime, receiveEndTime);
+        tbDeviceDeliveryService.dataExport(serviceId, usageType, crmNo, status, deliverUserId, deliverStartTime, deliverEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime);
         return ResultUtil.ok();
     }
 }

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBDeviceDeliveryResult.java

@@ -2,7 +2,6 @@ package com.qmth.sop.business.bean.result;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.qmth.sop.common.enums.DeviceDeliveryStatusEnum;
 import com.qmth.sop.common.enums.DeviceUsageTypeEnum;
 import com.qmth.sop.common.enums.InOutTypeEnum;
@@ -15,7 +14,6 @@ import java.io.Serializable;
  * @Author: wangliang
  * @Date: 2023/11/30
  */
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class TBDeviceDeliveryResult implements Serializable {
 
     @ApiModelProperty("id")
@@ -114,6 +112,10 @@ public class TBDeviceDeliveryResult implements Serializable {
     @ExcelIgnore
     private Long receiveTime;
 
+    @ApiModelProperty("生命周期")
+    @ExcelIgnore
+    private Boolean effect;
+
     public Long getId() {
         return id;
     }
@@ -305,4 +307,12 @@ public class TBDeviceDeliveryResult implements Serializable {
     public void setReceiveTime(Long receiveTime) {
         this.receiveTime = receiveTime;
     }
+
+    public Boolean getEffect() {
+        return effect;
+    }
+
+    public void setEffect(Boolean effect) {
+        this.effect = effect;
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/mapper/TBDeviceDeliveryMapper.java

@@ -33,6 +33,7 @@ public interface TBDeviceDeliveryMapper extends BaseMapper<TBDeviceDelivery> {
      * @param deliverStartTime deliverStartTime
      * @param deliverEndTime   deliverEndTime
      * @param serialNo         serialNo
+     * @param deviceNo         deviceNo
      * @param supplierId       supplierId
      * @param receiveStartTime receiveStartTime
      * @param receiveEndTime   receiveEndTime
@@ -47,6 +48,7 @@ public interface TBDeviceDeliveryMapper extends BaseMapper<TBDeviceDelivery> {
                                        @Param("deliverStartTime") Long deliverStartTime,
                                        @Param("deliverEndTime") Long deliverEndTime,
                                        @Param("serialNo") String serialNo,
+                                       @Param("deviceNo") String deviceNo,
                                        @Param("supplierId") Long supplierId,
                                        @Param("receiveStartTime") Long receiveStartTime,
                                        @Param("receiveEndTime") Long receiveEndTime);
@@ -62,6 +64,7 @@ public interface TBDeviceDeliveryMapper extends BaseMapper<TBDeviceDelivery> {
      * @param deliverStartTime deliverStartTime
      * @param deliverEndTime   deliverEndTime
      * @param serialNo         serialNo
+     * @param deviceNo         deviceNo
      * @param supplierId       supplierId
      * @param receiveStartTime receiveStartTime
      * @param receiveEndTime   receiveEndTime
@@ -75,6 +78,7 @@ public interface TBDeviceDeliveryMapper extends BaseMapper<TBDeviceDelivery> {
                                       @Param("deliverStartTime") Long deliverStartTime,
                                       @Param("deliverEndTime") Long deliverEndTime,
                                       @Param("serialNo") String serialNo,
+                                      @Param("deviceNo") String deviceNo,
                                       @Param("supplierId") Long supplierId,
                                       @Param("receiveStartTime") Long receiveStartTime,
                                       @Param("receiveEndTime") Long receiveEndTime);

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

@@ -51,12 +51,13 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param deliveryStartTime 发货开始时间
      * @param deliveryEndTime   发货结束时间
      * @param serialNo          设备序列号
+     * @param deviceNo          设备编号
      * @param supplierId        供应商
      * @param receiveStartTime  验收开始时间
      * @param receiveEndTime    验收结束时间
      * @return 分页结果
      */
-    IPage<TBDeviceDeliveryResult> page(IPage<Map> iPage, Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception;
+    IPage<TBDeviceDeliveryResult> page(IPage<Map> iPage, Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, String deviceNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception;
 
     /**
      * 设备发货管理列表
@@ -69,12 +70,13 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param deliveryStartTime 发货开始时间
      * @param deliveryEndTime   发货结束时间
      * @param serialNo          设备序列号
+     * @param deviceNo          设备编号
      * @param supplierId        供应商
      * @param receiveStartTime  验收开始时间
      * @param receiveEndTime    验收结束时间
      * @return 分页结果
      */
-    List<TBDeviceDeliveryResult> list(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception;
+    List<TBDeviceDeliveryResult> list(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, String deviceNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception;
 
     /**
      * 设备发货管理导出
@@ -87,11 +89,12 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param deliveryStartTime 发货开始时间
      * @param deliveryEndTime   发货结束时间
      * @param serialNo          设备序列号
+     * @param deviceNo          设备编号
      * @param supplierId        供应商
      * @param receiveStartTime  验收开始时间
      * @param receiveEndTime    验收结束时间分页结果
      */
-    void dataExport(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception;
+    void dataExport(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, String deviceNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception;
 
     /**
      * 新增设备发货入库记录

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

@@ -188,13 +188,16 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
     }
 
     @Override
-    public IPage<TBDeviceDeliveryResult> page(IPage<Map> iPage, Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception {
+    public IPage<TBDeviceDeliveryResult> page(IPage<Map> iPage, Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, String deviceNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception {
         if (crmNo != null && crmNo.length() > 0) {
             crmNo = SystemConstant.translateSpecificSign(crmNo);
         }
         if (serialNo != null && serialNo.length() > 0) {
             serialNo = SystemConstant.translateSpecificSign(serialNo);
         }
+        if (deviceNo != null && deviceNo.length() > 0) {
+            deviceNo = SystemConstant.translateSpecificSign(deviceNo);
+        }
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
         if (dpr.getHasDeviceDelivery()) {
@@ -205,7 +208,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
             }
             supplierId = userSupplierId;
         }
-        IPage<TBDeviceDeliveryResult> page = this.baseMapper.page(iPage, serviceId, usageType, crmNo, status, deliverUserId, deliveryStartTime, deliveryEndTime, serialNo, supplierId, receiveStartTime, receiveEndTime);
+        IPage<TBDeviceDeliveryResult> page = this.baseMapper.page(iPage, serviceId, usageType, crmNo, status, deliverUserId, deliveryStartTime, deliveryEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime);
         for (TBDeviceDeliveryResult e : page.getRecords()) {
             this.fillResultInfo(e);
         }
@@ -213,13 +216,16 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
     }
 
     @Override
-    public List<TBDeviceDeliveryResult> list(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception {
+    public List<TBDeviceDeliveryResult> list(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, String deviceNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception {
         if (crmNo != null && crmNo.length() > 0) {
             crmNo = SystemConstant.translateSpecificSign(crmNo);
         }
         if (serialNo != null && serialNo.length() > 0) {
             serialNo = SystemConstant.translateSpecificSign(serialNo);
         }
+        if (deviceNo != null && deviceNo.length() > 0) {
+            deviceNo = SystemConstant.translateSpecificSign(deviceNo);
+        }
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
         if (dpr.getHasDeviceDelivery()) {
@@ -230,7 +236,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
             }
             supplierId = userSupplierId;
         }
-        List<TBDeviceDeliveryResult> result = this.baseMapper.list(serviceId, usageType, crmNo, status, deliverUserId, deliveryStartTime, deliveryEndTime, serialNo, supplierId, receiveStartTime, receiveEndTime);
+        List<TBDeviceDeliveryResult> result = this.baseMapper.list(serviceId, usageType, crmNo, status, deliverUserId, deliveryStartTime, deliveryEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime);
         for (TBDeviceDeliveryResult e : result) {
             this.fillResultInfo(e);
         }
@@ -238,8 +244,8 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
     }
 
     @Override
-    public void dataExport(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception {
-        List<TBDeviceDeliveryResult> datasource = this.list(serviceId, usageType, crmNo, status, deliverUserId, deliveryStartTime, deliveryEndTime, serialNo, supplierId, receiveStartTime, receiveEndTime);
+    public void dataExport(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, String deviceNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception {
+        List<TBDeviceDeliveryResult> datasource = this.list(serviceId, usageType, crmNo, status, deliverUserId, deliveryStartTime, deliveryEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime);
         File fileTemp = null;
         try {
             fileTemp = SystemConstant.getFileTempVar(SystemConstant.XLSX_PREFIX);

sop-business/src/main/resources/mapper/TBDeviceDeliveryMapper.xml

@@ -22,7 +22,8 @@
             tbdd.status,
             tbdd.deliver_time AS deliverTime,
             su.real_name AS deliverUserName,
-            tbdd.receive_time AS receiveTime
+            tbdd.receive_time AS receiveTime,
+            tbdd.effect
         FROM
             t_b_device_delivery tbdd
         LEFT JOIN
@@ -61,6 +62,9 @@
             <if test="serialNo != null and serialNo != ''">
                 AND tbdd.serial_no = #{serialNo}
             </if>
+            <if test="deviceNo != null and deviceNo != ''">
+                AND sd.device_code = #{deviceNo}
+            </if>
             <if test="supplierId != null">
                 AND tbdd.supplier_id = #{supplierId}
             </if>
@@ -76,8 +80,8 @@
     <select id="list" resultType="com.qmth.sop.business.bean.result.TBDeviceDeliveryResult">
         SELECT
             tbdd.id,
-            tbs.name AS serviceName,
-            tbdd.crm_no AS crmNo,
+            IFNULL(tbs.name,'--') AS serviceName,
+            IFNULL(tbdd.crm_no, '--') AS crmNo,
             tbdd.usage_type AS usageType,
             tbdd.delivery_type AS deliveryType,
             ss.name AS supplierName,
@@ -93,7 +97,8 @@
             tbdd.status,
             tbdd.deliver_time AS deliverTime,
             su.real_name AS deliverUserName,
-            tbdd.receive_time AS receiveTime
+            tbdd.receive_time AS receiveTime,
+            tbdd.effect
         FROM
             t_b_device_delivery tbdd
         LEFT JOIN
@@ -132,6 +137,9 @@
             <if test="serialNo != null and serialNo != ''">
                 AND tbdd.serial_no = #{serialNo}
             </if>
+            <if test="deviceNo != null and deviceNo != ''">
+                AND sd.device_code = #{deviceNo}
+            </if>
             <if test="supplierId != null">
                 AND tbdd.supplier_id = #{supplierId}
             </if>