From 09e1c1155f4db6dc7a829e515337aa88ac4db81c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 18 八月 2025 13:24:14 +0800
Subject: [PATCH] 修改完善
---
src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java | 5 +
src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java | 2
src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java | 2
src/main/resources/mapper/warehouse/WarehouseMapper.xml | 68 +---------------
src/main/resources/mybatis/mybatis-config.xml | 4
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 2
src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml | 16 ++--
src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java | 7 -
src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java | 3
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java | 2
src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java | 5
src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 5 +
src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java | 4
src/main/java/com/ruoyi/warehouse/service/DocumentClassificationService.java | 2
src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java | 3
src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java | 5
src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml | 17 ++--
src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml | 11 +-
src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml | 21 +++-
src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java | 6 -
20 files changed, 72 insertions(+), 118 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
index da262fa..f92edd7 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
@@ -26,8 +26,8 @@
private DocumentClassificationService documentClassificationService;
//鏍戠粨鏋�
@GetMapping("/getList")
- public List<DocumentClassificationTreeDto> getList(DocumentClassificationDto documentClassificationDto) {
- return documentClassificationService.selectDocumentClassificationList(documentClassificationDto);
+ public List<DocumentClassificationTreeDto> getList() {
+ return documentClassificationService.selectDocumentClassificationList();
}
@PostMapping("/add")
@ApiOperation("鏂囨。鍒嗙被-娣诲姞")
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index ae008b5..3f82c37 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -29,7 +29,7 @@
@ApiOperation("鍟嗗搧璐ф灦-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listById(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
- List<WarehouseGoodsShelves> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
+ List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
return AjaxResult.success(list);
}
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
index acbcdc1..8039f72 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
@@ -17,4 +17,9 @@
*/
@Excel(name = "鍊熼槄浜�")
private String nickName;
+ /**
+ * 褰掕繕浜�
+ */
+ @Excel(name = "褰掕繕浜�")
+ private String returnNickName;
}
diff --git a/src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java b/src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java
index cccc3e7..6f76cb0 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/ReturnExportDto.java
@@ -8,21 +8,20 @@
import java.time.LocalDateTime;
public class ReturnExportDto {
-
private String id; // 璁板綍缂栧彿
@Excel(name = "鏂囨。鍚嶇О")
private String docName; // 鏂囨。鍚嶇О
@Excel(name = "鍘熷�熼槄浜�")
private String nickName; // 鍊熼槄浜�
- @Excel(name = "褰掕繕鏃堕棿", dateFormat = "yyyy-MM-dd", width = 30)
+ @Excel(name = "鍊熼槄鏃堕棿", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDateTime borrowTime; // 鍊熼槄鏃堕棿锛堝彲鑳介渶瑕佷繚鐣欙級
+ private LocalDateTime borrowDate; // 鍊熼槄鏃堕棿
@Excel(name = "褰掕繕浜�")
@NotBlank(message = "褰掕繕浜轰笉鑳戒负绌�!!")
private String returnNickName; // 褰掕繕浜�
@Excel(name = "褰掕繕鏃堕棿", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDateTime updateTime; // 褰掕繕鏃堕棿
+ private LocalDateTime returnDate; // 褰掕繕鏃堕棿
}
diff --git a/src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java b/src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java
index 2de94da..34ac3f1 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java
@@ -10,7 +10,4 @@
private String goodsShelvesName;
private String category;
-// private List<DocumentationDto> documentationList;
-// private List<WarehouseGoodsShelvesRowcolDto> warehouseGoodsShelvesRowcolList;
- private List<WarehouseGoodsShelvesDto> warehouseGoodsShelvesList;
}
diff --git a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java
index 2deee59..b637542 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesDto.java
@@ -6,8 +6,7 @@
public class WarehouseGoodsShelvesDto extends WarehouseGoodsShelves {
private String warehouseName;
- private String goodsShelvesName;
-// private List<DocumentationDto> documentationList;
- private List<WarehouseGoodsShelvesRowcolDto> warehouseGoodsShelvesRowcolList;
+ private String docName;
+ private String docNumber;
private String category;
}
diff --git a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
index 1008499..0f82839 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
@@ -10,6 +10,7 @@
public class WarehouseGoodsShelvesRowcolDto extends WarehouseGoodsShelvesRowcol {
private String warehouseName;
private String goodsShelvesName;
- private List<DocumentationDto> documentationList;
+ private String docName;
+ private String docNumber;
private String category;
}
diff --git a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java
index 6e68368..d02e0cd 100644
--- a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java
+++ b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java
@@ -21,7 +21,7 @@
public interface WarehouseGoodsShelvesMapper extends BaseMapper<WarehouseGoodsShelves> {
List<WarehouseGoodsShelvesDto> findList(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
- List<WarehouseGoodsShelves> listAll(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
+ List<WarehouseGoodsShelvesDto> listAll(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
}
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index 3166ff1..b71d4a2 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -41,6 +41,11 @@
*/
@ApiModelProperty(value = "鍊熼槄浜篿d")
private Long borrowerId;
+ /**
+ * 褰掕繕浜篿d
+ */
+ @ApiModelProperty(value = "褰掕繕浜篿d")
+ private Long returnerId;
/**
* 鍊熼槄鐩殑
diff --git a/src/main/java/com/ruoyi/warehouse/service/DocumentClassificationService.java b/src/main/java/com/ruoyi/warehouse/service/DocumentClassificationService.java
index 921e9e3..0fbe456 100644
--- a/src/main/java/com/ruoyi/warehouse/service/DocumentClassificationService.java
+++ b/src/main/java/com/ruoyi/warehouse/service/DocumentClassificationService.java
@@ -16,5 +16,5 @@
boolean deleteByIds(List<Long> ids);
- List<DocumentClassificationTreeDto> selectDocumentClassificationList(DocumentClassificationDto documentClassificationDto);
+ List<DocumentClassificationTreeDto> selectDocumentClassificationList();
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java b/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java
index a1cd010..622d8e1 100644
--- a/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java
+++ b/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java
@@ -23,5 +23,5 @@
boolean deleteByIds(List<Long> ids);
- List<WarehouseGoodsShelves> findList(WarehouseGoodsShelves warehouseGoodsShelves);
+ List<WarehouseGoodsShelvesDto> findList(WarehouseGoodsShelves warehouseGoodsShelves);
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java
index a36a143..54c642e 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java
@@ -48,14 +48,10 @@
}
@Override
- public List<DocumentClassificationTreeDto> selectDocumentClassificationList(DocumentClassificationDto documentClassificationDto) {
+ public List<DocumentClassificationTreeDto> selectDocumentClassificationList() {
// 鏌ヨ鏍硅妭鐐癸紙parentId 涓� null锛�
LambdaQueryWrapper<DocumentClassification> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.isNull(DocumentClassification::getParentId);
-
- if (documentClassificationDto.getCategory() != null && !documentClassificationDto.getCategory().isEmpty()) {
- queryWrapper.like(DocumentClassification::getCategory, documentClassificationDto.getCategory());
- }
// 鏌ヨ鏍硅妭鐐瑰垪琛�
List<DocumentClassification> rootList = baseMapper.selectList(queryWrapper);
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
index 05a075e..05bfdc2 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
@@ -52,13 +52,12 @@
}
@Override
public boolean reventdbm(DocumentationBorrowManagement documentationBorrowManagement) {
- DocumentationBorrowManagement documentationBorrowManagement1 = new DocumentationBorrowManagement();
// 鏇存柊鍊熼槄璁板綍鐘舵�佷负褰掕繕
+ DocumentationBorrowManagement documentationBorrowManagement1 = documentationBorrowManagementMapper.selectById(documentationBorrowManagement.getId());
+ documentationBorrowManagement1.setReturnerId(documentationBorrowManagement.getReturnerId());
documentationBorrowManagement1.setBorrowStatus("褰掕繕");
documentationBorrowManagement1.setReturnDate(LocalDateTime.now());
documentationBorrowManagementMapper.updateById(documentationBorrowManagement1);
- documentationBorrowManagementMapper.update(documentationBorrowManagement1,new LambdaQueryWrapper<DocumentationBorrowManagement>().eq(DocumentationBorrowManagement::getId,documentationBorrowManagement.getId()));
-
// 鏇存柊鏂囨。鐘舵�佷负姝ｅ父
Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
documentation.setDocStatus("姝ｅ父");
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
index 09d1c78..267e154 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
@@ -165,7 +165,7 @@
@Override
- public List<WarehouseGoodsShelves> findList(WarehouseGoodsShelves warehouseGoodsShelves) {
+ public List<WarehouseGoodsShelvesDto> findList(WarehouseGoodsShelves warehouseGoodsShelves) {
return warehouseGoodsShelvesMapper.listAll(warehouseGoodsShelves);
}
diff --git a/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml b/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml
index 9274443..e758e4f 100644
--- a/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml
@@ -5,14 +5,14 @@
<mapper namespace="com.ruoyi.warehouse.mapper.DocumentClassificationMapper">
<resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentClassification">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="category" column="category" jdbcType="VARCHAR"/>
- <result property="parentId" column="parent_id" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
+ <id property="id" column="id" />
+ <result property="category" column="category" />
+ <result property="parentId" column="parent_id" />
+ <result property="createTime" column="create_time" />
+ <result property="createUser" column="create_user" />
+ <result property="updateTime" column="update_time" />
+ <result property="updateUser" column="update_user" />
+ <result property="tenantId" column="tenant_id" />
</resultMap>
<sql id="Base_Column_List">
diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
index 9d54137..c004398 100644
--- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -28,8 +28,12 @@
<!-- create_time,create_user,update_time,-->
<!-- update_user,tenant_id-->
<!-- </sql>-->
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">
- select *from documentation_borrow_management
+ <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
+ select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name
+ from documentation_borrow_management dbm
+ LEFT JOIN documentation doc on doc.id = dbm.documentation_id
+ LEFT JOIN sys_user su on su.user_id = dbm.borrower_id
+ LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id
where 1=1
<if test="documentationBorrowManagement.borrowStatus != null">
and borrow_status = #{documentationBorrowManagement.borrowStatus}
@@ -40,6 +44,9 @@
<if test="documentationBorrowManagement.borrowerId != null">
and borrower_id = #{documentationBorrowManagement.borrowerId}
</if>
+ <if test="documentationBorrowManagement.returnerId != null">
+ and returner_id = #{documentationBorrowManagement.returnerId}
+ </if>
<if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
</if>
@@ -48,11 +55,12 @@
</if>
</select>
<select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
- select dbm.*,doc.doc_name,su.nick_name
+ select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name
from documentation_borrow_management dbm
LEFT JOIN documentation doc on doc.id = dbm.documentation_id
LEFT JOIN sys_user su on su.user_id = dbm.borrower_id
- where 1=1
+ LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id
+ where sur.nick_name IS NOT NULL
<if test="documentationBorrowManagement.borrowStatus != null">
and borrow_status = #{documentationBorrowManagement.borrowStatus}
</if>
@@ -70,11 +78,12 @@
</if>
</select>
<select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
- select dbm.*,doc.doc_name,su.nick_name,su.nick_name as return_nick_name
+ select dbm.*,doc.doc_name,su.nick_name,sur.nick_name as return_nick_name
from documentation_borrow_management dbm
LEFT JOIN documentation doc on doc.id = dbm.documentation_id
LEFT JOIN sys_user su on su.user_id = dbm.borrower_id
- where 1=1
+ LEFT JOIN sys_user sur on sur.user_id = dbm.returner_id
+ where sur.nick_name IS NOT NULL
<if test="documentationBorrowManagement.borrowStatus != null">
and borrow_status = #{documentationBorrowManagement.borrowStatus}
</if>
diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
index 8b1d771..8493e2d 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
@@ -6,10 +6,10 @@
<select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
SELECT
- wgsr.*,
+ doc.doc_name,
+ doc.doc_number,
+ wgs.*,
w.warehouse_name,
- wgs.goods_shelves_name,
- doc.*,
dc.category
FROM warehouse_goods_shelves_rowcol wgsr
LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
@@ -29,8 +29,9 @@
</if>
</where>
</select>
- <select id="listAll" resultType="com.ruoyi.warehouse.pojo.WarehouseGoodsShelves">
- select * from warehouse_goods_shelves
+ <select id="listAll" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
+ select wgs.*,w.warehouse_name from warehouse_goods_shelves wgs
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
<where>
1=1
<if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
index ccffa73..908e954 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
@@ -3,19 +3,18 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper">
-
-
<select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto">
SELECT
- wgsr.*,
- w.warehouse_name,
- wgs.goods_shelves_name,
- doc.*,
- dc.category
- FROM warehouse_goods_shelves_rowcol wgsr
+ doc.doc_name,
+ doc.doc_number,
+ wgsr.*,
+ w.warehouse_name,
+ wgs.goods_shelves_name,
+ dc.category
+ FROM documentation doc
+ LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
<where>
1=1
diff --git a/src/main/resources/mapper/warehouse/WarehouseMapper.xml b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
index 8f7affe..4ccb3fe 100644
--- a/src/main/resources/mapper/warehouse/WarehouseMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
@@ -4,72 +4,13 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseMapper">
-<!-- <!– 瀹氫箟 WarehouseDto 鐨� resultMap锛堜紭鍖栧悗锛� –>-->
-<!-- <resultMap id="WarehouseDtoResultMap" type="com.ruoyi.warehouse.dto.WarehouseDto">-->
-<!-- <!– 鏄犲皠 Warehouse 鐖剁被鐨勫瓧娈碉紙浠撳簱涓昏〃淇℃伅锛� –>-->
-<!-- <id property="id" column="w_id"/> <!– 鏄庣‘鍒悕锛岄伩鍏嶄笌瀛愯〃id鍐茬獊 –>-->
-<!-- <result property="warehouseName" column="warehouse_name"/>-->
-<!-- <!– 鍏朵粬鐖剁被瀛楁鎸夐渶娣诲姞锛屽缓璁粺涓�鍔犺〃鍒悕鍓嶇紑 –>-->
-<!-- <!– 绉婚櫎 WarehouseDto 涓殑 goodsShelvesName 瀛楁鏄犲皠-->
-<!-- 鍘熷洜锛氳瀛楁灞炰簬瀛愯〃 warehouse_goods_shelves锛屽簲閫氳繃宓屽闆嗗悎鑾峰彇锛岄伩鍏嶆暟鎹涔� –>-->
-
-<!-- <!– 鏄犲皠 WarehouseDto 鑷韩鐨勫垎绫诲瓧娈碉紙鑻ヤ笟鍔￠渶瑕佸叧鑱旀枃妗ｅ垎绫伙級 –>-->
-<!-- <result property="category" column="category"/>-->
-
-<!-- <!– 鏄犲皠宓屽闆嗗悎锛氫粨搴�-璐ф灦锛堜竴瀵瑰锛� –>-->
-<!-- <collection property="warehouseGoodsShelvesList" ofType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">-->
-<!-- <id property="id" column="wgs_id"/> <!– 璐ф灦琛ㄤ富閿紝鍞竴鏍囪瘑 –>-->
-<!-- <result property="goodsShelvesName" column="goods_shelves_name"/>-->
-<!-- <result property="warehouseId" column="w_id"/> <!– 鍏宠仈浠撳簱鐨勫閿紝渚夸簬鍙嶅悜杩芥函 –>-->
-<!-- <!– 鍏朵粬璐ф灦瀛楁鎸夐渶娣诲姞锛堝鍒涘缓鏃堕棿銆佺姸鎬佺瓑锛� –>-->
-
-<!-- <!– 鏄犲皠宓屽闆嗗悎锛氳揣鏋�-琛屽垪锛堜竴瀵瑰锛� –>-->
-<!-- <collection property="warehouseGoodsShelvesRowcolList" ofType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto">-->
-<!-- <id property="id" column="wgsr_id"/> <!– 琛屽垪琛ㄨ嚜韬富閿紝淇鍘熷閿埆鍚嶅鑷寸殑姝т箟 –>-->
-<!-- <result property="storey" column="storey"/>-->
-<!-- <result property="arrange" column="arrange"/>-->
-<!-- <result property="warehouseGoodsShelvesId" column="wgs_id"/> <!– 鍏宠仈璐ф灦鐨勫閿� –>-->
-<!-- <!– 鍏朵粬琛屽垪瀛楁鎸夐渶娣诲姞锛堝瀹归噺銆佺姸鎬佺瓑锛� –>-->
-<!-- </collection>-->
-<!-- </collection>-->
-<!-- </resultMap>-->
-
-<!-- <select id="findList" resultMap="WarehouseDtoResultMap">-->
-<!-- SELECT-->
-<!-- w.id AS w_id, -- 浠撳簱琛╥d鍔犲埆鍚嶏紝閬垮厤涓庡瓙琛╥d鍐茬獊-->
-<!-- w.warehouse_name,-->
-<!-- wgs.id AS wgs_id, -- 璐ф灦琛╥d鍔犲埆鍚�-->
-<!-- wgs.goods_shelves_name,-->
-<!-- wgsr.id AS wgsr_id, -- 琛屽垪琛╥d鍔犲埆鍚嶏紙淇鍘熷閿埆鍚嶏紝鏄庣‘涓轰富閿級-->
-<!-- wgsr.storey,-->
-<!-- wgsr.arrange,-->
-<!-- dc.category-->
-<!-- FROM warehouse_goods_shelves_rowcol wgsr-->
-<!-- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id-->
-<!-- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id-->
-<!-- -- 鍏宠仈鏂囨。琛ㄥ拰鍒嗙被琛ㄦ椂锛岃嫢鏃犻渶鏂囨。璇︽儏锛屽缓璁敤 EXISTS 浼樺寲锛岄伩鍏嶉噸澶嶆暟鎹�-->
-<!-- LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id-->
-<!-- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id-->
-<!-- <where>-->
-<!-- <!– 绉婚櫎 1=1锛孧yBatis鐨剋here鏍囩浼氳嚜鍔ㄥ鐞嗛涓狝ND –>-->
-<!-- <if test="warehouse.warehouseName != null and warehouse.warehouseName != ''">-->
-<!-- AND w.warehouse_name LIKE CONCAT('%', #{warehouse.warehouseName}, '%')-->
-<!-- </if>-->
-<!-- <if test="warehouse.id != null">-->
-<!-- AND w.id = #{warehouse.id}-->
-<!-- </if>-->
-<!-- </where>-->
-<!-- -- 鍒嗙粍鍘婚噸锛氶伩鍏嶅洜澶氳〃杩炴帴瀵艰嚧鐨勯噸澶嶆暟鎹紙鏍稿績浼樺寲鐐癸級-->
-<!-- GROUP BY w.id, wgs.id, wgsr.id-->
-<!-- </select>-->
-
- <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto">
+ <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto">
SELECT
- wgsr.*,
- w.warehouse_name,
+ w.*,
wgs.goods_shelves_name,
doc.doc_name,
+ doc.doc_number,
dc.category
FROM warehouse_goods_shelves_rowcol wgsr
LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
@@ -93,6 +34,9 @@
<if test="warehouse.warehouseName != null">
and warehouse_name like concat('%',#{warehouse.warehouseName},'%')
</if>
+ <if test="warehouse.id != null">
+ and w.id = #{warehouse.id}
+ </if>
</where>
</select>
</mapper>
diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml
index ec5fa1a..ee4d2a1 100644
--- a/src/main/resources/mybatis/mybatis-config.xml
+++ b/src/main/resources/mybatis/mybatis-config.xml
@@ -12,8 +12,8 @@
<!-- 閰嶇疆榛樿鐨勬墽琛屽櫒.SIMPLE灏辨槸鏅�氭墽琛屽櫒;REUSE鎵ц鍣ㄤ細閲嶇敤棰勫鐞嗚鍙�(prepared statements);BATCH鎵ц鍣ㄥ皢閲嶇敤璇彞骞舵墽琛屾壒閲忔洿鏂� -->
<setting name="defaultExecutorType" value="SIMPLE" />
<!-- 鎸囧畾 MyBatis 鎵�鐢ㄦ棩蹇楃殑鍏蜂綋瀹炵幇 -->
-<!-- <setting name="logImpl" value="SLF4J" />-->
- <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />
+ <setting name="logImpl" value="SLF4J" />
+<!-- <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />-->
<!-- 浣跨敤椹煎嘲鍛藉悕娉曡浆鎹㈠瓧娈� -->
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
</settings>
--
Gitblit v1.9.3