From ca511301d30594decf86b1a53eed3bbfc0b60ead Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 03 六月 2025 17:11:01 +0800
Subject: [PATCH] 工具管理-工具出库流水查询、导出接口调整
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml | 13 +++++-
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java | 8 ++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutStoreDetailController.java | 27 ++++++++++++-
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java | 33 ++++++++++++----
4 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutStoreDetailController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutStoreDetailController.java
index 11f95c5..68bf76b 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutStoreDetailController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutStoreDetailController.java
@@ -9,8 +9,11 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.OutStoreDetail;
import org.jeecg.modules.tms.entity.vo.OutStoreDetailVo;
@@ -155,12 +158,30 @@
* 瀵煎嚭excel
*
* @param request
- * @param outStoreDetail
*/
//@RequiresPermissions("org.jeecg.modules:tms_out_store_detail:exportXls")
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, OutStoreDetail outStoreDetail) {
- return super.exportXls(request, outStoreDetail, OutStoreDetail.class, "宸ュ叿鍑哄簱娴佹按");
+ public ModelAndView exportXls(HttpServletRequest request) {
+ // Step.1 缁勮鏌ヨ鏉′欢
+ Map<String, String[]> parameterMap = request.getParameterMap();
+ Page<OutStoreDetailVo> page = new Page<>(1, 1000000);
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+ // Step.2 鑾峰彇瀵煎嚭鏁版嵁
+ IPage<OutStoreDetailVo> pageList = outStoreDetailService.queryPageList(page, parameterMap);
+ List<OutStoreDetailVo> exportList = pageList.getRecords();
+
+ // Step.3 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ //姝ゅ璁剧疆鐨刦ilename鏃犳晥 ,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
+ mv.addObject(NormalExcelConstants.FILE_NAME, "宸ュ叿鍑哄簱娴佹按");
+ mv.addObject(NormalExcelConstants.CLASS, OutStoreDetailVo.class);
+ //update-begin--Author:liusq Date:20210126 for锛氬浘鐗囧鍑烘姤閿欙紝ImageBasePath鏈缃�--------------------
+ ExportParams exportParams=new ExportParams("宸ュ叿鍑哄簱娴佹按" + "鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "宸ュ叿鍑哄簱娴佹按");
+ //update-end--Author:liusq Date:20210126 for锛氬浘鐗囧鍑烘姤閿欙紝ImageBasePath鏈缃�----------------------
+ mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+ mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+ return mv;
}
/**
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java
index 0b201b2..1a393d3 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java
@@ -34,45 +34,62 @@
@ApiModelProperty(value = "涓婚敭")
private String id;
/**宸ュ叿缂栫爜*/
+ @Excel(name = "宸ュ叿缂栫爜", width = 15)
@ApiModelProperty(value = "宸ュ叿缂栫爜")
private String toolCode;
/**宸ュ叿缂栧彿*/
+ @Excel(name = "宸ュ叿缂栧彿", width = 25)
@ApiModelProperty(value = "宸ュ叿缂栧彿")
private String toolId;
/**鍑哄簱绫诲瀷*/
+ @Excel(name = "鍑哄簱绫诲瀷", width = 15,dicCode = "out_storehouse_type")
@Dict(dicCode = "out_storehouse_type")
@ApiModelProperty(value = "鍑哄簱绫诲瀷")
private String outStorehouseType;
/**搴撲綅鍙�*/
+ @Excel(name = "搴撲綅鍙�", width = 15)
@ApiModelProperty(value = "搴撲綅鍙�")
private String goodsShelvesCode;
/**鍑哄簱鏁伴噺*/
+ @Excel(name = "鍑哄簱鏁伴噺", width = 10)
@ApiModelProperty(value = "鍑哄簱鏁伴噺")
private BigDecimal outNumber;
/**鍑哄簱鐢宠鍗曞彿*/
+ @Excel(name = "鍑哄簱鐢宠鍗曞彿", width = 15)
@ApiModelProperty(value = "鍑哄簱鐢宠鍗曞彿")
private String outStorehouseId;
/**鍑哄簱鎿嶄綔鏂瑰紡;1.鎸夌敵璇峰崟 2.鎵嬪伐鎿嶄綔*/
+ @Excel(name = "鍑哄簱鎿嶄綔鏂瑰紡", width = 15)
@ApiModelProperty(value = "鍑哄簱鎿嶄綔鏂瑰紡;1.鎸夌敵璇峰崟 2.鎵嬪伐鎿嶄綔")
private String operateType;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
+ /**宸ュ叿绫诲瀷*/
+ @Excel(name = "宸ュ叿绫诲瀷", width = 15)
+ @ApiModelProperty(value = "宸ュ叿绫诲瀷")
+ private String applicationType;
/**涓枃鍚嶇О*/
+ @Excel(name = "涓枃鍚嶇О", width = 15)
@ApiModelProperty(value = "涓枃鍚嶇О")
private String chineseName;
/**鍨嬪彿/鍥惧彿*/
+ @Excel(name = "鍨嬪彿/鍥惧彿", width = 15)
@ApiModelProperty(value = "鍨嬪彿/鍥惧彿")
private String toolModel;
/**鍒�鍏锋潗鏂�*/
+ @Excel(name = "鍒�鍏锋潗鏂�", width = 15)
@ApiModelProperty(value = "鍒�鍏锋潗鏂�")
private String toolMaterial;
/**闆朵欢鏉愭枡*/
+ @Excel(name = "闆朵欢鏉愭枡", width = 15)
@ApiModelProperty(value = "闆朵欢鏉愭枡")
private String partMaterial;
+ /**鍒涘缓浜�*/
+ @Excel(name = "鍒涘缓浜�", width = 15)
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @Excel(name = "鍒涘缓鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
index 59e9ae8..1233eaf 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/OutStoreDetailMapper.xml
@@ -5,18 +5,27 @@
<select id="queryPageList" resultType="org.jeecg.modules.tms.entity.vo.OutStoreDetailVo">
SELECT
t1.id,
- t1.tool_code toolCode,
+ t2.tool_code toolCode,
t1.tool_id toolId,
t1.out_storehouse_type outStorehouseType,
t1.goods_shelves_code goodsShelvesCode,
t1.out_number outNumber,
t1.out_storehouse_id outStorehouseId,
- t1.operate_type operateType,
+ case t1.operate_type
+ when '1' then '鐢宠鍗�'
+ when '2' then '鎵嬪伐鎿嶄綔'
+ else ''
+ end operateType,
t1.create_by createBy,
t1.create_time createTime,
t2.chinese_name chineseName,
t2.tool_model toolModel,
t2.parama_table_name paramaTableName,
+ case t3.application_type
+ when '1' then '閫氱敤宸ュ叿'
+ when '2' then '涓撶敤宸ュ叿'
+ else ''
+ end applicationType,
<choose>
<when test="ew.paramNameValuePairs.paramaTableName == '1'">
t4.tool_material toolMaterial,
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
index 7f0709d..7a7015c 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
@@ -30,6 +30,14 @@
if (classifyIds != null && classifyIds.length > 0) {
queryWrapper.eq("t2.classify_id", classifyIds[0]);
}
+ String[] toolCodes = parameterMap.get("toolCode");
+ if (toolCodes != null && toolCodes.length > 0) {
+ queryWrapper.like("t2.tool_code", toolCodes[0]);
+ }
+ String[] toolModels = parameterMap.get("toolModel");
+ if (toolModels != null && toolModels.length > 0) {
+ queryWrapper.like("t2.tool_model", toolModels[0]);
+ }
queryWrapper.orderByDesc("t1.create_time");
return this.baseMapper.queryPageList(page, queryWrapper);
}
--
Gitblit v1.9.3