From 290a7c436cd79a4ed359c3f435c0b8c290c50163 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 四月 2025 17:08:58 +0800
Subject: [PATCH] art: 设备管理-周保-基础代码提交
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 143 ++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderDetailService.java | 14 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 59 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java | 54 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderMapper.java | 17 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderDetailServiceImpl.java | 19 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrderDetail.java | 67 ++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderDetailMapper.java | 17 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderDetailController.java | 71 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderDetailMapper.xml | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 104 ++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java | 21 ++
15 files changed, 599 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
index 0c3dcaf..13ba179 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -9,6 +9,8 @@
String EQUIPMENT_FAULT_REASON_RULE = "EquipmentFaultReasonRule";
//淇濆吇鏍囧噯缂栫爜瑙勫垯
String MAINTENANCE_STANDARD_CODE_RULE = "MaintenanceStandardCodeRule";
+ //鍛ㄤ繚缂栫爜瑙勫垯
+ String WEEK_MAINTENANCE_CODE_RULE = "WeekMaintenanceCodeRule";
/**
* 澶囦欢璇疯喘鍗曠姸鎬� 1:宸插垱寤� 2:宸叉彁浜� 3:宸查�氳繃 4:宸查┏鍥� 5:宸插畬鎴�
*/
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java
index fb6b517..bf36926 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java
@@ -6,5 +6,6 @@
WAIT_SPARES, //绛夊浠�
WAIT_CONFIRM, //寰呯‘璁�
COMPLETE, //宸插畬鎴�
+ ABOLISH, //宸蹭綔搴�
;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
new file mode 100644
index 0000000..536ae5f
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -0,0 +1,143 @@
+package org.jeecg.modules.eam.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
+import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
+import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "鍛ㄤ繚宸ュ崟")
+@RestController
+@RequestMapping("/eam/weekMaintenanceOrder")
+public class EamWeekMaintenanceOrderController extends JeecgController<EamWeekMaintenanceOrder, IEamWeekMaintenanceOrderService> {
+ @Autowired
+ private IEamWeekMaintenanceOrderService eamWeekMaintenanceOrderService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamWeekMaintenanceOrder
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍛ㄤ繚宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamWeekMaintenanceOrder eamWeekMaintenanceOrder,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EamWeekMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamWeekMaintenanceOrder, req.getParameterMap());
+ Page<EamWeekMaintenanceOrder> page = new Page<EamWeekMaintenanceOrder>(pageNo, pageSize);
+ IPage<EamWeekMaintenanceOrder> pageList = eamWeekMaintenanceOrderService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param request
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-娣诲姞")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-娣诲姞", notes = "鍛ㄤ繚宸ュ崟-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamWeekMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.WEEK_MAINTENANCE_CODE_RULE);
+ request.setOrderNum(codeSeq);
+ boolean b = eamWeekMaintenanceOrderService.addWeekMaintenance(request);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param eamWeekMaintenanceOrder
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-缂栬緫")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-缂栬緫", notes = "鍛ㄤ繚宸ュ崟-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamWeekMaintenanceOrder eamWeekMaintenanceOrder) {
+ eamWeekMaintenanceOrderService.updateById(eamWeekMaintenanceOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-閫氳繃id鍒犻櫎", notes = "鍛ㄤ繚宸ュ崟-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ eamWeekMaintenanceOrderService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺鍒犻櫎", notes = "鍛ㄤ繚宸ュ崟-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.eamWeekMaintenanceOrderService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-閫氳繃id鏌ヨ", notes = "鍛ㄤ繚宸ュ崟-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamWeekMaintenanceOrder eamWeekMaintenanceOrder = eamWeekMaintenanceOrderService.getById(id);
+ return Result.OK(eamWeekMaintenanceOrder);
+ }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderDetailController.java
new file mode 100644
index 0000000..15c0774
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderDetailController.java
@@ -0,0 +1,71 @@
+package org.jeecg.modules.eam.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
+import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="鍛ㄤ繚宸ュ崟鏄庣粏")
+@RestController
+@RequestMapping("/eam/weekMaintenanceOrderDetail")
+public class EamWeekMaintenanceOrderDetailController extends JeecgController<EamWeekMaintenanceOrderDetail, IEamWeekMaintenanceOrderDetailService> {
+ @Autowired
+ private IEamWeekMaintenanceOrderDetailService eamWeekMaintenanceOrderDetailService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param orderId
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍛ㄤ繚宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(@RequestParam("orderId") String orderId,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ LambdaQueryWrapper<EamWeekMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamWeekMaintenanceOrderDetail::getOrderId, orderId);
+ queryWrapper.orderByAsc(EamWeekMaintenanceOrderDetail::getItemCode);
+ Page<EamWeekMaintenanceOrderDetail> page = new Page<>(pageNo, pageSize);
+ IPage<EamWeekMaintenanceOrderDetail> pageList = eamWeekMaintenanceOrderDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 涓�娆″姞杞�
+ *
+ * @param orderId
+ * @return
+ */
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�", notes = "鍛ㄤ繚宸ュ崟鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�")
+ @GetMapping(value = "/queryList")
+ public Result<?> queryList(@RequestParam("orderId") String orderId) {
+ LambdaQueryWrapper<EamWeekMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamWeekMaintenanceOrderDetail::getOrderId, orderId);
+ queryWrapper.orderByAsc(EamWeekMaintenanceOrderDetail::getItemCode);
+ List<EamWeekMaintenanceOrderDetail> list = eamWeekMaintenanceOrderDetailService.list(queryWrapper);
+ return Result.OK(list);
+ }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
new file mode 100644
index 0000000..d0752ca
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
@@ -0,0 +1,104 @@
+package org.jeecg.modules.eam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_week_maintenance_order")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="eam_week_maintenance_order瀵硅薄", description="鍛ㄤ繚宸ュ崟")
+public class EamWeekMaintenanceOrder implements Serializable {
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private Integer delFlag;
+ /**宸ュ崟鍙�*/
+ @Excel(name = "宸ュ崟鍙�", width = 15)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String orderNum;
+ /**璁惧ID*/
+ @ApiModelProperty(value = "璁惧ID")
+ @Dict(dicCode = "eam_equipment, equipment_code, id")
+ private String equipmentId;
+ /**鏍囧噯ID*/
+ @ApiModelProperty(value = "鏍囧噯ID")
+ @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
+ private String standardId;
+ /**璁″垝淇濆吇鏃ユ湡*/
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDate;
+ /**瀹為檯寮�濮嬫椂闂�*/
+ @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualStartTime;
+ /**瀹為檯缁撴潫鏃堕棿*/
+ @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualEndTime;
+ /**淇濆吇浜�*/
+ @ApiModelProperty(value = "淇濆吇浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String operator;
+ /**淇濆吇鐘舵��*/
+ @ApiModelProperty(value = "淇濆吇鐘舵��")
+ @Dict(dicCode = "maintenance_status")
+ private String maintenanceStatus;
+ /**鍒涘缓鏂瑰紡*/
+ @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ @Dict(dicCode = "order_creation_method")
+ private String creationMethod;
+ /**纭浜�*/
+ @ApiModelProperty(value = "纭浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmUser;
+ /**纭鏃堕棿*/
+ @ApiModelProperty(value = "纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ /**淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧*/
+ @ApiModelProperty(value = "淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧")
+ private String imageFiles;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrderDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrderDetail.java
new file mode 100644
index 0000000..4372cde
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrderDetail.java
@@ -0,0 +1,67 @@
+package org.jeecg.modules.eam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_week_maintenance_order_detail")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="eam_week_maintenance_order_detail瀵硅薄", description="鍛ㄤ繚宸ュ崟鏄庣粏")
+public class EamWeekMaintenanceOrderDetail implements Serializable {
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**宸ュ崟ID*/
+ @ApiModelProperty(value = "宸ュ崟ID")
+ private String orderId;
+ /**淇濆吇椤瑰簭鍙�*/
+ @ApiModelProperty(value = "淇濆吇椤瑰簭鍙�")
+ private Integer itemCode;
+ /**淇濆吇椤�*/
+ @ApiModelProperty(value = "淇濆吇椤�")
+ private String itemName;
+ /**瀛愪繚鍏婚」*/
+ @ApiModelProperty(value = "瀛愪繚鍏婚」")
+ private String subItemName;
+ /**淇濆吇瑕佹眰*/
+ @ApiModelProperty(value = "淇濆吇瑕佹眰")
+ private String itemDemand;
+ /**淇濆吇缁撴灉*/
+ @ApiModelProperty(value = "淇濆吇缁撴灉")
+ private String maintenanceResult;
+ /**寮傚父鎻忚堪*/
+ @ApiModelProperty(value = "寮傚父鎻忚堪")
+ private String exceptionDescription;
+ /**鎶ヤ慨鏍囪*/
+ @ApiModelProperty(value = "鎶ヤ慨鏍囪")
+ private String reportFlag;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderDetailMapper.java
new file mode 100644
index 0000000..6a66dbf
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderDetailMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.eam.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+public interface EamWeekMaintenanceOrderDetailMapper extends BaseMapper<EamWeekMaintenanceOrderDetail> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderMapper.java
new file mode 100644
index 0000000..dd6a97f
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamWeekMaintenanceOrderMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.eam.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+public interface EamWeekMaintenanceOrderMapper extends BaseMapper<EamWeekMaintenanceOrder> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderDetailMapper.xml
new file mode 100644
index 0000000..86361a5
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderDetailMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.eam.mapper.EamWeekMaintenanceOrderDetailMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml
new file mode 100644
index 0000000..5ef1488
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.eam.mapper.EamWeekMaintenanceOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java
new file mode 100644
index 0000000..df69050
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java
@@ -0,0 +1,54 @@
+package org.jeecg.modules.eam.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="eam_maintenance_standard瀵硅薄", description="淇濆吇鏍囧噯")
+public class EamWeekMaintenanceRequest implements Serializable {
+
+ /**涓婚敭*/
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**宸ュ崟鍙�*/
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String orderNum;
+ /**璁惧ID*/
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**鏍囧噯ID*/
+ @ApiModelProperty(value = "鏍囧噯ID")
+ private String standardId;
+ /**淇濆吇鏃ユ湡*/
+ @ApiModelProperty(value = "淇濆吇鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDate;
+ /**淇濆吇浜�*/
+ @ApiModelProperty(value = "淇濆吇浜�")
+ private String operator;
+ /**淇濆吇鍥剧墖*/
+ @ApiModelProperty(value = "淇濆吇鍥剧墖")
+ private String imageFiles;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**鍒楄〃 淇濆吇椤规槑缁�*/
+ @ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
+ private List<EamWeekMaintenanceOrderDetail> tableDetailList;
+ /**鍒犻櫎 淇濆吇椤规槑缁�*/
+ @ApiModelProperty(value = "鍒犻櫎 淇濆吇椤规槑缁�")
+ private List<EamWeekMaintenanceOrderDetail> removeDetailList;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderDetailService.java
new file mode 100644
index 0000000..e536fa7
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderDetailService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.eam.service;
+
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+public interface IEamWeekMaintenanceOrderDetailService extends IService<EamWeekMaintenanceOrderDetail> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
new file mode 100644
index 0000000..497cb38
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
@@ -0,0 +1,21 @@
+package org.jeecg.modules.eam.service;
+
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
+
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+public interface IEamWeekMaintenanceOrderService extends IService<EamWeekMaintenanceOrder> {
+
+ /**
+ * 鎵嬪姩鏂板宸ュ崟
+ * @param request
+ * @return
+ */
+ boolean addWeekMaintenance(EamWeekMaintenanceRequest request);
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderDetailServiceImpl.java
new file mode 100644
index 0000000..6f7c727
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderDetailServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.eam.service.impl;
+
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
+import org.jeecg.modules.eam.mapper.EamWeekMaintenanceOrderDetailMapper;
+import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderDetailService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Service
+public class EamWeekMaintenanceOrderDetailServiceImpl extends ServiceImpl<EamWeekMaintenanceOrderDetailMapper, EamWeekMaintenanceOrderDetail> implements IEamWeekMaintenanceOrderDetailService {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
new file mode 100644
index 0000000..bfbf00e
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -0,0 +1,59 @@
+package org.jeecg.modules.eam.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.eam.constant.MaintenanceStatusEnum;
+import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
+import org.jeecg.modules.eam.mapper.EamWeekMaintenanceOrderMapper;
+import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
+import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderDetailService;
+import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description: 鍛ㄤ繚宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Service
+public class EamWeekMaintenanceOrderServiceImpl extends ServiceImpl<EamWeekMaintenanceOrderMapper, EamWeekMaintenanceOrder> implements IEamWeekMaintenanceOrderService {
+
+ @Resource
+ private EamWeekMaintenanceOrderMapper eamWeekMaintenanceOrderMapper;
+
+ @Autowired
+ private IEamWeekMaintenanceOrderDetailService eamWeekMaintenanceOrderDetailService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addWeekMaintenance(EamWeekMaintenanceRequest request) {
+ EamWeekMaintenanceOrder order = new EamWeekMaintenanceOrder();
+ order.setOrderNum(request.getOrderNum());
+ order.setEquipmentId(request.getEquipmentId());
+ order.setStandardId(request.getStandardId());
+ order.setMaintenanceDate(request.getMaintenanceDate());
+ order.setOperator(request.getOperator());
+ order.setRemark(request.getRemark());
+ //鐘舵�佸垵濮嬪寲
+ order.setMaintenanceStatus(MaintenanceStatusEnum.WAIT_MAINTENANCE.name());
+ order.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+ //鍒犻櫎鏍囪
+ order.setDelFlag(CommonConstant.DEL_FLAG_0);
+ eamWeekMaintenanceOrderMapper.insert(order);
+ //澶勭悊鏄庣粏鏁版嵁
+ if(CollectionUtil.isNotEmpty(request.getTableDetailList())) {
+ request.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setOrderId(order.getId());
+ });
+ eamWeekMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
+ }
+ return true;
+ }
+}
--
Gitblit v1.9.3