From 84aad71ec5188f5174181cf0bf6c58c78bce34c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Fri, 5 Dec 2025 10:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/EamController.java | 15 +++++ .../data/ExportEamPropertiesModelData.java | 43 ++++++++++++++ .../sys/modules/pms/mapper/EamMapper.java | 2 + .../sys/modules/pms/service/EamService.java | 2 + .../pms/service/Impl/EamServiceImpl.java | 5 ++ src/main/resources/mapper/pms/EamMapper.xml | 57 +++++++++++++++++++ 6 files changed, 124 insertions(+) create mode 100644 src/main/java/com/xujie/sys/modules/pms/data/ExportEamPropertiesModelData.java diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java index 305344aa..1b30b578 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java @@ -889,6 +889,21 @@ public class EamController { return R.ok().put("page", page); } + /** + * @Description TODO + * @Title exportEamPropertiesTemplateAndItem + * @param data + * @author zhb + * @date 2025/12/5 + * @return R + * @throw + */ + @PostMapping(value="/exportEamPropertiesTemplateAndItem") + public R exportEamPropertiesTemplateAndItem(@RequestBody EamPropertiesModelHeaderData data){ + List list = eamService.exportEamPropertiesTemplateAndItem(data); + return R.ok().put("rows", list).put("total", list.size()); + } + /** * @Description TODO * @Title eamPropertiesModelEdit diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ExportEamPropertiesModelData.java b/src/main/java/com/xujie/sys/modules/pms/data/ExportEamPropertiesModelData.java new file mode 100644 index 00000000..9185449b --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/pms/data/ExportEamPropertiesModelData.java @@ -0,0 +1,43 @@ +package com.xujie.sys.modules.pms.data; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.Date; + +@Data +public class ExportEamPropertiesModelData { + //维保模板主表 字段 + private String site; + private String bu; + private String buNo; + private String buDesc; + private String codeNo; + private String codeDesc; + private String active; + private String isUse; + @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8") + private Date createdDate; + private String createdBy; + @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8") + private Date updateDate; + private String updateBy; + + + //明细表字段 + private String itemNo; + private String itemDesc; + private String itemRemark; + private String valueType; + private String valueTypeDb; + private String valueChooseFlag; + private String defaultValue; + private Double maxValue; + private Double minValue; + private Integer orderId; + + +} + diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index 183780fa..da0ff550 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java @@ -516,4 +516,6 @@ public interface EamMapper { List getAllCoreComponents(EamWorkOrderCoreComponentsData data); void abandonedEamWorkOrder(EamWorkOrderData data); + + List exportEamPropertiesTemplateAndItem(@Param("query")EamPropertiesModelHeaderData data); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java index eb34c9e2..224b0525 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java @@ -1214,4 +1214,6 @@ public interface EamService { List getAllCoreComponents(EamWorkOrderCoreComponentsData data); void abandonedEamWorkOrder(EamWorkOrderData data); + + List exportEamPropertiesTemplateAndItem(EamPropertiesModelHeaderData data); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 12e9e042..cb2322a2 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -4017,6 +4017,11 @@ public class EamServiceImpl implements EamService { eamMapper.abandonedEamWorkOrder(data); } + @Override + public List exportEamPropertiesTemplateAndItem(EamPropertiesModelHeaderData data) { + return eamMapper.exportEamPropertiesTemplateAndItem(data); + } + /** * 员工考勤vs报工工时 */ diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 6cddb7be..17334836 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -4065,4 +4065,61 @@ +