From b84987e8d9def03bdf06f69e51de56e72d5b8131 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 14 八月 2025 17:40:57 +0800
Subject: [PATCH] 二保批量打印接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml | 5 +++--
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamSecondMaintenanceOrderExport.java | 5 +++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java | 1 +
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamSecondMaintenanceOrderExport.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamSecondMaintenanceOrderExport.java
index d3e97ee..f7a6d44 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamSecondMaintenanceOrderExport.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamSecondMaintenanceOrderExport.java
@@ -153,6 +153,11 @@
//鍨嬪彿
@TableField(exist = false)
private String equipmentModel;
+ //淇濆吇鏃ユ湡
+ private String maintenanceDateFormatted;
+ //浣跨敤鍗曚綅
+ private String factoryName;
+
//缁翠慨浜哄憳淇濆吇鍐呭
@DictList
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java
index 6bc31cb..67cbf37 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java
@@ -33,6 +33,7 @@
/**鍒涘缓浜�*/
@Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty(value = "鍒涘缓浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String createBy;
/**鍒涘缓鏃堕棿*/
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml
index 4084ac4..bee23d2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml
@@ -11,10 +11,11 @@
${ew.customSqlSegment}
</select>
<select id="queryList" resultType="org.jeecg.modules.eam.dto.EamSecondMaintenanceOrderExport">
- select wmo.*, e.equipment_code, e.equipment_name,e.equipment_model
+ select wmo.*,FORMAT(wmo.maintenance_date, 'yyyy骞碝M鏈坉d鏃�') AS maintenance_date_formatted, e.equipment_code, e.equipment_name,e.equipment_model,f.factory_name
from eam_second_maintenance_order wmo
inner join eam_equipment e
on wmo.equipment_id = e.id
- ${ew.customSqlSegment}
+ LEFT JOIN eam_base_factory f ON f.org_code = SUBSTRING ( e.factory_org_code , 1, 6 )
+ ${ew.customSqlSegment}
</select>
</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index f7ae1c9..e32fe77 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -678,6 +678,7 @@
public List<EamSecondMaintenanceOrderExport> export(String ids){
QueryWrapper<EamSecondMaintenanceOrderExport> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("wmo.del_flag",CommonConstant.DEL_FLAG_0.toString());
+ queryWrapper.eq("wmo.maintenance_status",SecondMaintenanceStatusEnum.COMPLETE.name());
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
--
Gitblit v1.9.3