diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java index 240f2a381..4e0e3c3ba 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.inv; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -64,6 +63,8 @@ public class FilterDeviceInspectTakeRequest extends ListPageRequest { private Integer repairType; + private Integer type; + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml index 78e2a0b5a..0d40e5067 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml @@ -71,6 +71,9 @@ AND t.level = #{level} + + AND t.type = #{type} + AND t.repairType = #{repairType} diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index f40d69dae..f0ec81f00 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -121,6 +121,7 @@ SELECT pur_apply_detail.*, pur_apply.billNo, basic_products.ggxh spec, + basic_products.nameCode, basic_products.measname, basic_products.manufactory, basic_products.ylqxzcrbarmc, diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml index fc9c249b9..d9a614695 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml @@ -139,6 +139,7 @@ - \ No newline at end of file +