add: 设备发货信息】查询条件增加“收件人”、“收件地址”下拉模糊查询

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

@@ -59,12 +59,15 @@ public class TBDeviceDeliveryController {
             @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,
+            @ApiParam(value = "收件人") @RequestParam(required = false) String consignee,
+            @ApiParam(value = "邮寄地址") @RequestParam(required = false) String mailingAddress,
             @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @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, deviceNo, SystemConstant.convertIdToLong(supplierId), receiveStartTime, receiveEndTime));
+                serialNo, deviceNo, SystemConstant.convertIdToLong(supplierId), receiveStartTime, receiveEndTime,
+                consignee, mailingAddress));
     }
 
     @ApiOperation(value = "设备发货保存接口")
@@ -124,9 +127,12 @@ public class TBDeviceDeliveryController {
             @ApiParam(value = "发货人id") @RequestParam(required = false) Long deliverUserId, @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 {
+            @ApiParam(value = "签收开始时间") @RequestParam(required = false) Long receiveStartTime, @ApiParam(value = "签收结束时间") @RequestParam(required = false) Long receiveEndTime,
+            @ApiParam(value = "收件人") @RequestParam(required = false) String consignee,
+            @ApiParam(value = "邮寄地址") @RequestParam(required = false) String mailingAddress) throws Exception {
         tbDeviceDeliveryService.dataExport(serviceId, usageType, crmNo, status, deliverUserId, deliverStartTime,
-                deliverEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime);
+                deliverEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime, consignee,
+                mailingAddress);
     }
 
     @ApiOperation(value = "设备发货人列表查询")

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

@@ -37,21 +37,15 @@ public interface TBDeviceDeliveryMapper extends BaseMapper<TBDeviceDelivery> {
      * @param supplierId       supplierId
      * @param receiveStartTime receiveStartTime
      * @param receiveEndTime   receiveEndTime
+     * @param consignee        consignee
+     * @param mailingAddress   mailingAddress
      * @return 查询结果
      */
-    IPage<TBDeviceDeliveryResult> page(IPage<Map> iPage,
-                                       @Param("serviceId") Long serviceId,
-                                       @Param("usageType") DeviceUsageTypeEnum usageType,
-                                       @Param("crmNo") String crmNo,
-                                       @Param("status") DeviceDeliveryStatusEnum status,
-                                       @Param("deliverUserId") Long deliverUserId,
-                                       @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);
+    IPage<TBDeviceDeliveryResult> page(IPage<TBDeviceDeliveryResult> iPage, @Param("serviceId") Long serviceId, @Param("usageType") DeviceUsageTypeEnum usageType,
+            @Param("crmNo") String crmNo, @Param("status") DeviceDeliveryStatusEnum status, @Param("deliverUserId") Long deliverUserId,
+            @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, @Param("consignee") String consignee, @Param("mailingAddress") String mailingAddress);
 
     /**
      * 设备发货列表查询
@@ -66,20 +60,13 @@ public interface TBDeviceDeliveryMapper extends BaseMapper<TBDeviceDelivery> {
      * @param serialNo         serialNo
      * @param deviceNo         deviceNo
      * @param supplierId       supplierId
-     * @param receiveStartTime receiveStartTime
-     * @param receiveEndTime   receiveEndTime
+     * @param consignee        consignee
+     * @param mailingAddress   mailingAddress
      * @return 查询结果
      */
-    List<TBDeviceDeliveryResult> list(@Param("serviceId") Long serviceId,
-                                      @Param("usageType") DeviceUsageTypeEnum usageType,
-                                      @Param("crmNo") String crmNo,
-                                      @Param("status") DeviceDeliveryStatusEnum status,
-                                      @Param("deliverUserId") Long deliverUserId,
-                                      @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);
+    List<TBDeviceDeliveryResult> list(@Param("serviceId") Long serviceId, @Param("usageType") DeviceUsageTypeEnum usageType,
+            @Param("crmNo") String crmNo, @Param("status") DeviceDeliveryStatusEnum status, @Param("deliverUserId") Long deliverUserId,
+            @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, @Param("consignee") String consignee, @Param("mailingAddress") String mailingAddress);
 }

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

@@ -35,7 +35,7 @@ public interface TBServiceMapper extends BaseMapper<TBService> {
      * @param serviceUnitName 服务单元名称
      * @return 分页查询结果
      */
-    IPage<ServiceUnitResult> findServiceUnitPage(@Param("iPage") Page<SysLogResult> iPage,
+    IPage<ServiceUnitResult> findServiceUnitPage(@Param("iPage") Page<ServiceUnitResult> iPage,
                                                  @Param("type") ProductTypeEnum type,
                                                  @Param("serviceLeadId") Long serviceLeadId,
                                                  @Param("status") ServiceStatusEnum status,

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

@@ -32,7 +32,7 @@ public interface TBServiceRegionMapper extends BaseMapper<TBServiceRegion> {
      * @param dpr           数据权限
      * @return 分页查询结果
      */
-    IPage<ServiceRegionResult> findServiceRegionPage(@Param("iPage") Page<SysLogResult> iPage,
+    IPage<ServiceRegionResult> findServiceRegionPage(@Param("iPage") Page<ServiceRegionResult> iPage,
                                                      @Param("serviceUnitId") Long serviceUnitId,
                                                      @Param("regionName") String regionName,
                                                      @Param("leadId") Long leadId,

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

@@ -36,7 +36,7 @@ public interface TBUserArchivesAllocationMapper extends BaseMapper<TBUserArchive
      * @param dpr           数据权限
      * @return 分页查询结果
      */
-    IPage<UserArchivesAllocationResult> findCrmAllocationPage(@Param("iPage") Page<SysLogResult> iPage,
+    IPage<UserArchivesAllocationResult> findCrmAllocationPage(@Param("iPage") Page<UserArchivesAllocationResult> iPage,
                                                               @Param("serviceUnitId") Long serviceUnitId,
                                                               @Param("province") String province,
                                                               @Param("city") String city,

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

@@ -14,7 +14,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -57,12 +56,13 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param supplierId        供应商
      * @param receiveStartTime  验收开始时间
      * @param receiveEndTime    验收结束时间
+     * @param consignee         收件人
+     * @param mailingAddress    收件地址
      * @return 分页结果
      */
-    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;
+    IPage<TBDeviceDeliveryResult> page(IPage<TBDeviceDeliveryResult> 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, String consignee, String mailingAddress) throws Exception;
 
     /**
      * 设备发货管理列表
@@ -79,12 +79,13 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param supplierId        供应商
      * @param receiveStartTime  验收开始时间
      * @param receiveEndTime    验收结束时间
+     * @param consignee         收件人
+     * @param mailingAddress    收件地址
      * @return 分页结果
      */
     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;
+            String serialNo, String deviceNo, Long supplierId, Long receiveStartTime, Long receiveEndTime, String consignee, String mailingAddress) throws Exception;
 
     /**
      * 设备发货管理导出
@@ -101,10 +102,12 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param supplierId        供应商
      * @param receiveStartTime  验收开始时间
      * @param receiveEndTime    验收结束时间分页结果
+     * @param consignee         收件人
+     * @param mailingAddress    收件地址
      */
     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;
+            Long supplierId, Long receiveStartTime, Long receiveEndTime, String consignee, String mailingAddress) throws Exception;
 
     /**
      * 新增设备发货入库记录
@@ -166,6 +169,7 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
 
     /**
      * 查询设备返还集合（返还时）
+     *
      * @param deviceDeliveryIdList 设备发货id集合
      * @return 设备返还表单
      */

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

@@ -227,13 +227,14 @@ 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, String deviceNo, Long supplierId, Long receiveStartTime,
-            Long receiveEndTime) throws Exception {
+    public IPage<TBDeviceDeliveryResult> page(IPage<TBDeviceDeliveryResult> 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, String consignee, String mailingAddress) throws Exception {
         crmNo = SystemConstant.translateSpecificSign(crmNo);
         serialNo = SystemConstant.translateSpecificSign(serialNo);
         deviceNo = SystemConstant.translateSpecificSign(deviceNo);
+        consignee = SystemConstant.translateSpecificSign(consignee);
+        mailingAddress = SystemConstant.translateSpecificSign(mailingAddress);
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
         if (dpr.getHasDeviceDelivery() && !dpr.getHasAdmin() && !dpr.getHasPmo() && !dpr.getHasBusiness()
@@ -247,7 +248,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         }
         IPage<TBDeviceDeliveryResult> page = this.baseMapper.page(iPage, serviceId, usageType, crmNo, status,
                 deliverUserId, deliveryStartTime, deliveryEndTime, serialNo, deviceNo, supplierId, receiveStartTime,
-                receiveEndTime);
+                receiveEndTime, consignee, mailingAddress);
         for (TBDeviceDeliveryResult e : page.getRecords()) {
             this.fillResultInfo(e);
         }
@@ -257,17 +258,15 @@ 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, String deviceNo, Long supplierId, Long receiveStartTime, Long receiveEndTime)
+            String serialNo, String deviceNo, Long supplierId, Long receiveStartTime, Long receiveEndTime, String consignee, String mailingAddress)
             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);
-        }
+
+        crmNo = SystemConstant.translateSpecificSign(crmNo);
+        serialNo = SystemConstant.translateSpecificSign(serialNo);
+        deviceNo = SystemConstant.translateSpecificSign(deviceNo);
+        consignee = SystemConstant.translateSpecificSign(consignee);
+        mailingAddress = SystemConstant.translateSpecificSign(mailingAddress);
+
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
         if (dpr.getHasDeviceDelivery() && !dpr.getHasAdmin() && !dpr.getHasPmo() && !dpr.getHasBusiness()
@@ -280,7 +279,8 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
             supplierId = userSupplierId;
         }
         List<TBDeviceDeliveryResult> result = this.baseMapper.list(serviceId, usageType, crmNo, status, deliverUserId,
-                deliveryStartTime, deliveryEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime);
+                deliveryStartTime, deliveryEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime,
+                consignee, mailingAddress);
         for (TBDeviceDeliveryResult e : result) {
             this.fillResultInfo(e);
         }
@@ -290,9 +290,11 @@ 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, String deviceNo,
-            Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception {
+            Long supplierId, Long receiveStartTime, Long receiveEndTime, String consignee, String mailingAddress) throws Exception {
+
         List<TBDeviceDeliveryResult> datasource = this.list(serviceId, usageType, crmNo, status, deliverUserId,
-                deliveryStartTime, deliveryEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime);
+                deliveryStartTime, deliveryEndTime, serialNo, deviceNo, supplierId, receiveStartTime, receiveEndTime,
+                consignee, mailingAddress);
         File fileTemp = null;
         try {
             fileTemp = SystemConstant.getFileTempVar(SystemConstant.XLSX_PREFIX);

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

@@ -74,6 +74,12 @@
             <if test="receiveEndTime != null and receiveEndTime != ''">
                 AND tbdd.receive_time <![CDATA[ <= ]]> #{receiveEndTime}
             </if>
+            <if test="consignee != null and consignee != ''">
+                AND tbdd.consignee LIKE CONCAT('%',#{consignee},'%')
+            </if>
+            <if test="mailingAddress != null and mailingAddress != ''">
+                AND tbdd.mailing_address LIKE CONCAT('%',#{mailingAddress},'%')
+            </if>
         </where>
         ORDER BY tbdd.update_time DESC
     </select>
@@ -150,6 +156,12 @@
             <if test="receiveEndTime != null and receiveEndTime != ''">
                 AND tbdd.receive_time <![CDATA[ <= ]]> #{receiveEndTime}
             </if>
+            <if test="consignee != null and consignee != ''">
+                AND tbdd.consignee LIKE CONCAT('%',#{consignee},'%')
+            </if>
+            <if test="mailingAddress != null and mailingAddress != ''">
+                AND tbdd.mailing_address LIKE CONCAT('%',#{mailingAddress},'%')
+            </if>
         </where>
         ORDER BY tbdd.update_time DESC
     </select>