From 7911497ffa51bd41fc334153b2a456ff02554747 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 01 四月 2025 15:20:37 +0800
Subject: [PATCH] 整体流程测试修改0401-2
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceScrapPageVo.java | 24 ++++++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/DeviceRepairQueryDTO.java | 12 +++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceScrapController.java | 12 +--
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceScrapService.java | 5 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java | 2
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceRepairPageVo.java | 28 +++++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceScrapMapper.java | 6 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceRepairMapper.java | 6 +
platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml | 21 +++++
platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml | 2
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java | 2
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java | 21 +++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceRepairService.java | 5 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java | 8 ++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceScrapServiceImpl.java | 8 ++
platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml | 24 +++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java | 13 +--
17 files changed, 179 insertions(+), 20 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/DeviceRepairQueryDTO.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/DeviceRepairQueryDTO.java
new file mode 100644
index 0000000..756a95e
--- /dev/null
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/DeviceRepairQueryDTO.java
@@ -0,0 +1,12 @@
+package com.by4cloud.platformx.device.dto;
+
+import lombok.Data;
+
+@Data
+public class DeviceRepairQueryDTO {
+
+ private String deviceName;
+
+ private String serialNo;
+
+}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceRepairPageVo.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceRepairPageVo.java
new file mode 100644
index 0000000..e31f789
--- /dev/null
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceRepairPageVo.java
@@ -0,0 +1,28 @@
+package com.by4cloud.platformx.device.entity.vo;
+
+import com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceRepairPageVo {
+
+ private Long id;
+
+ private String deviceName;
+
+ private String deviceCode;
+
+ private String serialNo;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date repairEndDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date repairStartDate;
+
+ private String status;
+
+}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceScrapPageVo.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceScrapPageVo.java
new file mode 100644
index 0000000..9689f4a
--- /dev/null
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/DeviceScrapPageVo.java
@@ -0,0 +1,24 @@
+package com.by4cloud.platformx.device.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DeviceScrapPageVo {
+
+ private Long id;
+
+ private String deviceName;
+
+ private String deviceCode;
+
+ private String serialNo;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date scrapDate;
+
+ private String status;
+
+}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java
index f570bff..2fba759 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceRepairController.java
@@ -1,14 +1,12 @@
package com.by4cloud.platformx.device.controller;
-import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.DeviceRepair;
import com.by4cloud.platformx.device.service.DeviceRepairService;
@@ -43,17 +41,14 @@
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param deviceRepair 璁惧缁翠慨
+ * @param queryDTO 璁惧缁翠慨
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('device_deviceRepair_view')" )
- public R getDeviceRepairPage(@ParameterObject Page page, @ParameterObject DeviceRepair deviceRepair) {
- LambdaQueryWrapper<DeviceRepair> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(StrUtil.isNotBlank(deviceRepair.getSerialNo()),DeviceRepair::getSerialNo,deviceRepair.getSerialNo());
- wrapper.orderByDesc(DeviceRepair::getCreateTime);
- return R.ok(deviceRepairService.page(page, wrapper));
+ public R getDeviceRepairPage(@ParameterObject Page page, DeviceRepairQueryDTO queryDTO) {
+ return R.ok(deviceRepairService.pageNew(page, queryDTO));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceScrapController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceScrapController.java
index 7ac2bfd..148e3e8 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceScrapController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceScrapController.java
@@ -2,12 +2,11 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
-import com.by4cloud.platformx.device.entity.DeviceRepair;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceScrap;
import com.by4cloud.platformx.device.service.DeviceScrapService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -21,7 +20,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Objects;
/**
* 璁惧鎶ュ簾
@@ -41,16 +39,14 @@
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param deviceScrap 璁惧鎶ュ簾
+ * @param queryDTO 璁惧鎶ュ簾
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('device_deviceScrap_view')" )
- public R getDeviceScrapPage(@ParameterObject Page page, @ParameterObject DeviceScrap deviceScrap) {
- LambdaQueryWrapper<DeviceScrap> wrapper = Wrappers.lambdaQuery();
- wrapper.orderByDesc(DeviceScrap::getCreateTime);
- return R.ok(deviceScrapService.page(page, wrapper));
+ public R getDeviceScrapPage(@ParameterObject Page page, @ParameterObject DeviceRepairQueryDTO queryDTO) {
+ return R.ok(deviceScrapService.pageNew(page, queryDTO));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
index db13e6d..9b2fe48 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
@@ -84,7 +84,7 @@
@PreAuthorize("@pms.hasPermission('device_purchaseWinningLetter_add')" )
public R save(@RequestBody PurchaseWinningLetterEntity purchaseWinningLetter) {
purchaseWinningLetter.setWinningCode(maxSizeService.nextNo(MaxSizeContant.WINNING_CODE));
- return R.ok(purchaseWinningLetterService.save(purchaseWinningLetter));
+ return purchaseWinningLetterService.saveNew(purchaseWinningLetter);
}
/**
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceRepairMapper.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceRepairMapper.java
index d93cca8..292e1d0 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceRepairMapper.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceRepairMapper.java
@@ -1,11 +1,17 @@
package com.by4cloud.platformx.device.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceRepair;
+import com.by4cloud.platformx.device.entity.vo.DeviceRepairPageVo;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface DeviceRepairMapper extends PlatformxBaseMapper<DeviceRepair> {
+ IPage<DeviceRepairPageVo> pageNew(Page page,@Param("queryDTO") DeviceRepairQueryDTO queryDTO);
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceScrapMapper.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceScrapMapper.java
index ebfb2e1..368efe5 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceScrapMapper.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceScrapMapper.java
@@ -1,11 +1,17 @@
package com.by4cloud.platformx.device.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceScrap;
+import com.by4cloud.platformx.device.entity.vo.DeviceScrapPageVo;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface DeviceScrapMapper extends PlatformxBaseMapper<DeviceScrap> {
+ IPage<DeviceScrapPageVo> pageNew(Page page, @Param("queryDTO") DeviceRepairQueryDTO queryDTO);
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceRepairService.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceRepairService.java
index 055fd4e..a88b0c4 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceRepairService.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceRepairService.java
@@ -1,7 +1,10 @@
package com.by4cloud.platformx.device.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceRepair;
public interface DeviceRepairService extends IService<DeviceRepair> {
@@ -9,4 +12,6 @@
R approved(Long id);
R complete(Long id);
+
+ IPage pageNew(Page page, DeviceRepairQueryDTO queryDTO);
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceScrapService.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceScrapService.java
index 8d4cf0f..3eaecdb 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceScrapService.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceScrapService.java
@@ -1,10 +1,15 @@
package com.by4cloud.platformx.device.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceScrap;
public interface DeviceScrapService extends IService<DeviceScrap> {
R approved(Long id);
+
+ IPage pageNew(Page page, DeviceRepairQueryDTO queryDTO);
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java
index 22e5be4..571d764 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/PurchaseWinningLetterService.java
@@ -1,8 +1,10 @@
package com.by4cloud.platformx.device.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
public interface PurchaseWinningLetterService extends IService<PurchaseWinningLetterEntity> {
+ R saveNew(PurchaseWinningLetterEntity purchaseWinningLetter);
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java
index c483823..8171bb7 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java
@@ -1,7 +1,10 @@
package com.by4cloud.platformx.device.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.DeviceRepair;
import com.by4cloud.platformx.device.mapper.DeviceInventoryMapper;
@@ -42,4 +45,9 @@
inventoryMapper.updateById(inventory);
return R.ok();
}
+
+ @Override
+ public IPage pageNew(Page page, DeviceRepairQueryDTO queryDTO) {
+ return baseMapper.pageNew(page,queryDTO);
+ }
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceScrapServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceScrapServiceImpl.java
index 2dd8044..b6777a0 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceScrapServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceScrapServiceImpl.java
@@ -1,7 +1,10 @@
package com.by4cloud.platformx.device.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.device.dto.DeviceRepairQueryDTO;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.DeviceRepair;
import com.by4cloud.platformx.device.entity.DeviceScrap;
@@ -33,4 +36,9 @@
return R.ok();
}
+ @Override
+ public IPage pageNew(Page page, DeviceRepairQueryDTO queryDTO) {
+ return baseMapper.pageNew(page,queryDTO);
+ }
+
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java
index 69f952b..3804eec 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java
@@ -1,9 +1,14 @@
package com.by4cloud.platformx.device.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
import com.by4cloud.platformx.device.entity.PurchaseWinningLetterEntity;
+import com.by4cloud.platformx.device.mapper.PurchaseTendrOrderMapper;
import com.by4cloud.platformx.device.mapper.PurchaseWinningLetterMapper;
import com.by4cloud.platformx.device.service.PurchaseWinningLetterService;
+import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
/**
* 涓爣閫氱煡涔�
@@ -12,5 +17,21 @@
* @date 2025-03-24 17:13:08
*/
@Service
+@AllArgsConstructor
public class PurchaseWinningLetterServiceImpl extends ServiceImpl<PurchaseWinningLetterMapper, PurchaseWinningLetterEntity> implements PurchaseWinningLetterService {
+
+ private final PurchaseTendrOrderMapper orderMapper;
+
+ @Override
+ public R saveNew(PurchaseWinningLetterEntity purchaseWinningLetter) {
+ baseMapper.insert(purchaseWinningLetter);
+ QueryWrapper<PurchaseTendrOrderEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("purchase_plan_code",purchaseWinningLetter.getPurchasePlanCode());
+ PurchaseTendrOrderEntity orderEntity = orderMapper.selectOne(queryWrapper);
+ if (orderEntity!=null){
+ orderEntity.setStatus("2");
+ orderMapper.updateById(orderEntity);
+ }
+ return R.ok();
+ }
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml
index f85d139..460e9fa 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceRepairMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="deviceRepairMap" type="com.by4cloud.platformx.device.entity.DeviceScrap">
<id property="id" column="id"/>
<result property="compId" column="comp_id"/>
- <result property="deviceCoder" column="device_coder"/>
+ <result property="deviceCode" column="device_code"/>
<result property="deviceId" column="device_id"/>
<result property="inventoryId" column="inventory_id"/>
<result property="repairEndDate" column="repair_end_date"/>
@@ -19,4 +19,26 @@
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
+ <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.DeviceRepairPageVo">
+ select
+ dr.id,
+ d.name deviceName,
+ d.`number` deviceCode,
+ dr.serial_no,
+ dr.repair_start_date,
+ dr.repair_end_date,
+ dr.status
+ from
+ device_repair dr
+ join device d on
+ dr.device_id = d.id
+ where
+ dr.del_flag='0'
+ <if test="queryDTO.deviceName != null and queryDTO.deviceName !=''">
+ and d.name like CONCAT('%', #{queryDTO.deviceName}, '%')
+ </if>
+ <if test="queryDTO.serialNo != null and queryDTO.serialNo !=''">
+ and dr.serial_no like CONCAT('%', #{queryDTO.serialNo}, '%')
+ </if>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
index 13c0b83..6137855 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceScrapMapper.xml
@@ -18,4 +18,25 @@
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
+ <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.DeviceScrapPageVo">
+ select
+ ds.id,
+ d.name deviceName,
+ d.`number` deviceCode,
+ ds.serial_no,
+ ds.scrap_date ,
+ ds.status
+ from
+ device_scrap ds
+ join device d on
+ ds.device_id = d.id
+ where
+ ds.del_flag='0'
+ <if test="queryDTO.deviceName != null and queryDTO.deviceName !=''">
+ and d.name like CONCAT('%', #{queryDTO.deviceName}, '%')
+ </if>
+ <if test="queryDTO.serialNo != null and queryDTO.serialNo !=''">
+ and ds.serial_no like CONCAT('%', #{queryDTO.serialNo}, '%')
+ </if>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
index 1e70e5c..a2d92d1 100644
--- a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
@@ -23,7 +23,7 @@
ifw.id,
d.name deviceName,
dc.name className,
- d.create_time ,
+ ifw.create_time ,
ifw.operate_type,
di.serial_no
from
--
Gitblit v1.9.1