From b7f2ba063db04ee0dbea09e632f413db7af25bac Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 14 八月 2025 19:40:50 +0800
Subject: [PATCH] 仓库货架，文档借阅修改
---
src/main/resources/mapper/warehouse/DocumentationMapper.xml | 2
src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java | 7 +--
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 6 +--
src/main/java/com/ruoyi/warehouse/pojo/Documentation.java | 46 +++++++++++++++++++++--
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 10 ----
src/main/resources/mapper/warehouse/WarehouseMapper.xml | 4 +-
src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml | 16 ++++----
src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 11 +++--
8 files changed, 65 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index e70cce9..86115af 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -43,8 +43,7 @@
@ApiOperation("鏂囨。淇℃伅琛�-娣诲姞")
@Log(title = "鏂囨。淇℃伅琛�-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Documentation documentation) {
- boolean save = documentationService.save(documentation);
- return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+ return AjaxResult.success(documentationService.save(documentation));
}
@PostMapping("/update")
@ApiOperation("鏂囨。淇℃伅琛�-鏇存柊")
@@ -57,9 +56,7 @@
@Log(title = "鏂囨。淇℃伅琛�-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- boolean remove = documentationService.removeBatchByIds(ids);
-// boolean remove = documentationService.deleteByIds(ids);
- return remove ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ return AjaxResult.success(documentationService.removeBatchByIds(ids));
}
@PostMapping("/export")
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index a7281f0..8b675ee 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -36,8 +36,7 @@
@ApiOperation("浠撳簱-娣诲姞")
@Log(title = "浠撳簱-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Warehouse warehouse) {
- boolean save = warehouseService.save(warehouse);
- return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+ return AjaxResult.success(warehouseService.save(warehouse));
}
@PostMapping("/update")
@@ -52,7 +51,6 @@
@Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- boolean remove = warehouseService.deleteByIds(ids);
- return remove ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ return AjaxResult.success(warehouseService.deleteByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
index cc3ea71..f6c58ec 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
@@ -1,14 +1,14 @@
package com.ruoyi.warehouse.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -23,111 +23,149 @@
*
*/
@TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "鏂囨。ID")
private Long id;
/**
* 绫诲埆鍚嶇О
*/
+ @Excel(name = "绫诲埆鍚嶇О")
+ @ApiModelProperty(value = "绫诲埆鍚嶇О")
private String categoryName;
/**
* 鏂囨。鍚嶇О
*/
+ @Excel(name = "鏂囨。鍚嶇О")
+ @ApiModelProperty(value = "鏂囨。鍚嶇О")
private String docName;
/**
* 鏂囨。缂栧彿
*/
+ @Excel(name = "鏂囨。缂栧彿")
+ @ApiModelProperty(value = "鏂囨。缂栧彿")
private Long docNumber;
/**
* 骞翠唤
*/
+ @Excel(name = "骞翠唤")
+ @ApiModelProperty(value = "骞翠唤")
private Long year;
/**
* 璐ｄ换浜�
*/
+ @Excel(name = "璐ｄ换浜�")
+ @ApiModelProperty(value = "璐ｄ换浜�")
private String responsiblePerson;
/**
* 鏂囨。鏀剧疆浣嶇疆
*/
+ @Excel(name = "鏂囨。鏀剧疆浣嶇疆")
+ @ApiModelProperty(value = "鏂囨。鏀剧疆浣嶇疆")
private Long warehouseGoodsShelvesRowcolId;
/**
* 鏂囨。鏃ユ湡
*/
+ @Excel(name = "鏂囨。鏃ユ湡")
+ @ApiModelProperty(value = "鏂囨。鏃ユ湡")
private LocalDateTime docDate;
/**
* 淇濈鏈熼檺
*/
+ @Excel(name = "淇濈鏈熼檺")
+ @ApiModelProperty(value = "淇濈鏈熼檺")
private Long retentionPeriod;
/**
* 淇濆瘑绾у埆
*/
+ @Excel(name = "淇濆瘑绾у埆")
+ @ApiModelProperty(value = "淇濆瘑绾у埆")
private String securityLevel;
/**
* 浠芥暟
*/
+ @Excel(name = "浠芥暟")
+ @ApiModelProperty(value = "浠芥暟")
private Long copyCount;
/**
* 椤垫暟
*/
+ @Excel(name = "椤垫暟")
+ @ApiModelProperty(value = "椤垫暟")
private Long pageCount;
/**
* 鏂囨。绫诲埆
*/
+ @Excel(name = "鏂囨。绫诲埆")
+ @ApiModelProperty(value = "鏂囨。绫诲埆")
private String docCategory;
/**
* 鏂囨。绉嶇被
*/
+ @Excel(name = "鏂囨。绉嶇被")
+ @ApiModelProperty(value = "鏂囨。绉嶇被")
private String docType;
/**
* 绱ф�ョ▼搴�
*/
+ @Excel(name = "绱ф�ョ▼搴�")
+ @ApiModelProperty(value = "绱ф�ョ▼搴�")
private String urgencyLevel;
/**
* 鏂囨。鐘舵��
*/
+ @Excel(name = "鏂囨。鐘舵��")
+ @ApiModelProperty(value = "鏂囨。鐘舵��")
private String docStatus;
/**
* 澶囨敞
*/
+ @Excel(name = "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
/**
* 鍒涘缓鏃堕棿
*/
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
/**
* 鍒涘缓鐢ㄦ埛
*/
+ @TableField(fill = FieldFill.INSERT)
private Long createUser;
/**
* 淇敼鏃堕棿
*/
+ @TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
/**
* 淇敼鐢ㄦ埛
*/
+ @TableField(fill = FieldFill.UPDATE)
private Long updateUser;
/**
* 绉熸埛ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index 96e7394..1dfa7bd 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -1,9 +1,7 @@
package com.ruoyi.warehouse.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -68,26 +66,31 @@
/**
* 鍒涘缓鏃堕棿
*/
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
/**
* 鍒涘缓鐢ㄦ埛
*/
+ @TableField(fill = FieldFill.INSERT)
private Long createUser;
/**
* 淇敼鏃堕棿
*/
+ @TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
/**
* 淇敼鐢ㄦ埛
*/
+ @TableField(fill = FieldFill.UPDATE)
private Long updateUser;
/**
* 绉熸埛id
*/
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
index da8df11..60c255d 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
@@ -25,10 +25,7 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- /**
- * 鏂囨。id
- */
- private Long documentationId;
+
/**
* 灞傛暟
*/
@@ -43,11 +40,6 @@
* 璐ф灦id
*/
private Long warehouseGoodsShelvesId;
-
- /**
- * 浠撳簱id
- */
- private Long warehouseId;
/**
* 鍒涘缓鏃堕棿
diff --git a/src/main/resources/mapper/warehouse/DocumentationMapper.xml b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
index 1d015bb..533002a 100644
--- a/src/main/resources/mapper/warehouse/DocumentationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -59,6 +59,6 @@
select * from documentation t1
left join warehouse_goods_shelves_rowcol t2 on t1.warehouse_goods_shelves_rowcol_id = t2.id
left join warehouse_goods_shelves t3 on t2.warehouse_goods_shelves_id = t3.id
- left join warehouse t4 on t2.warehouse_id = t4.id
+ left join warehouse t4 on t3.warehouse_id = t4.id
</select>
</mapper>
diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
index f3f4d90..58479b1 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
@@ -9,17 +9,17 @@
select * from warehouse_goods_shelves_rowcol
<where>
1=1
- <if test="storey != null">
- and storey = #{storey}
+ <if test="warehouseGoodsShelvesRowcol.storey != null">
+ and storey = #{warehouseGoodsShelvesRowcol.storey}
</if>
- <if test="arrange != null">
- and arrange = #{arrange}
+ <if test="warehouseGoodsShelvesRowcol.arrange != null">
+ and arrange = #{warehouseGoodsShelvesRowcol.arrange}
</if>
- <if test="warehouseGoodsShelvesId != null">
- and warehouse_goods_shelves_id = #{warehouseGoodsShelvesId}
+ <if test="warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId != null">
+ and warehouse_goods_shelves_id = #{warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId}
</if>
- <if test="warehouseId != null">
- and warehouse_id = #{warehouseId}
+ <if test="warehouseGoodsShelvesRowcol.warehouseId != null">
+ and warehouse_id = #{warehouseGoodsShelvesRowcol.warehouseId}
</if>
</where>
</select>
diff --git a/src/main/resources/mapper/warehouse/WarehouseMapper.xml b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
index ac9cbc6..0ac5918 100644
--- a/src/main/resources/mapper/warehouse/WarehouseMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
@@ -9,8 +9,8 @@
select * from warehouse
<where>
1=1
- <if test="warehouseName != null">
- and warehouse_name like concat('%',#{warehouseName},'%')
+ <if test="warehouse.warehouseName != null">
+ and warehouse_name like concat('%',#{warehouse.warehouseName},'%')
</if>
</where>
</select>
--
Gitblit v1.9.3