From d4d757f2d1a32deecb5e13111d6e753dfa18a58e Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期一, 08 九月 2025 14:49:05 +0800
Subject: [PATCH] 故障报修流程审批节点字段调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairWarehouseController.java | 176 +++++++++++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IRepairWarehouseService.java | 23 ++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 44 ++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java | 30 +++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/RepairWarehouse.java | 78 ++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairWarehouseMapper.xml | 23 ++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java | 28 +++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/RepairWarehouseServiceImpl.java | 105 +++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/RepairWarehouseMapper.java | 18 ++
9 files changed, 521 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
index c28502d..956be53 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
@@ -93,6 +93,36 @@
@Excel(name = "鏁呴殰鍘熷洜", width = 15)
@ApiModelProperty(value = "鏁呴殰鍘熷洜")
private String faultReason;
+
+ /**
+ * 鏁呴殰绫诲瀷
+ */
+ @Excel(name = "鏁呴殰绫诲瀷", width = 15)
+ @ApiModelProperty(value = "鏁呴殰绫诲瀷")
+ @Dict(dicCode = "repair_warehouse_fault_type")
+ private String faultType;
+
+ /**
+ * 鏁呴殰閮ㄤ綅
+ */
+ @Excel(name = "鏁呴殰閮ㄤ綅", width = 15)
+ @ApiModelProperty(value = "鏁呴殰閮ㄤ綅")
+ private String faultPart;
+
+ /**
+ * 鏁呴殰瀛愰儴浣�
+ */
+ @Excel(name = "鏁呴殰瀛愰儴浣�", width = 15)
+ @ApiModelProperty(value = "鏁呴殰瀛愰儴浣�")
+ private String faultChildPart;
+
+ /**
+ * 涓ラ噸绋嬪害
+ */
+ @Excel(name = "涓ラ噸绋嬪害", width = 15)
+ @ApiModelProperty(value = "涓ラ噸绋嬪害")
+ @Dict(dicCode = "repair_severity")
+ private String severity;
/**
* 缁翠慨缁撴灉鎻忚堪
*/
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/RepairWarehouse.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/RepairWarehouse.java
new file mode 100644
index 0000000..2697b5f
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/RepairWarehouse.java
@@ -0,0 +1,78 @@
+package org.jeecg.modules.eam.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+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.jeecg.common.constant.CommonConstant;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: eam_repair_warehouse
+ * @Author: jeecg-boot
+ * @Date: 2025-09-05
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_repair_warehouse")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="eam_repair_warehouse瀵硅薄", description="缁翠慨鐭ヨ瘑搴�")
+public class RepairWarehouse implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ /**鏁呴殰绫诲瀷*/
+ @Excel(name = "鏁呴殰绫诲瀷", width = 15,dicCode = "repair_warehouse_fault_type")
+ @ApiModelProperty(value = "鏁呴殰绫诲瀷")
+ @Dict(dicCode = "repair_warehouse_fault_type")
+ private String faultType;
+ /**鏁呴殰閮ㄤ綅*/
+ @Excel(name = "鏁呴殰閮ㄤ綅", width = 15)
+ @ApiModelProperty(value = "鏁呴殰閮ㄤ綅")
+ private String faultPart;
+ /**鏁呴殰瀛愰儴浣�*/
+ @Excel(name = "鏁呴殰瀛愰儴浣�", width = 15)
+ @ApiModelProperty(value = "鏁呴殰瀛愰儴浣�")
+ private String faultChildPart;
+ /**缁翠慨鎻忚堪*/
+ @Excel(name = "缁翠慨鎻忚堪", width = 15)
+ @ApiModelProperty(value = "缁翠慨鎻忚堪")
+ private String repairDescription;
+ /**闇�瑕佽繑鍥炵殑瀛楁*/
+ @ApiModelProperty(value = "闇�瑕佽繑鍥炵殑瀛楁")
+ @TableField(exist = false)
+ private String column;
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/RepairWarehouseMapper.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/RepairWarehouseMapper.java
new file mode 100644
index 0000000..f79402d
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/RepairWarehouseMapper.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.eam.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.RepairWarehouse;
+
+import java.util.List;
+
+/**
+ * @Description: eam_repair_warehouse
+ * @Author: jeecg-boot
+ * @Date: 2025-09-05
+ * @Version: V1.0
+ */
+public interface RepairWarehouseMapper extends BaseMapper<RepairWarehouse> {
+
+ List<String> getColumnDateList(@Param("repairWarehouse") RepairWarehouse repairWarehouse);
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairWarehouseMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairWarehouseMapper.xml
new file mode 100644
index 0000000..3eda30c
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairWarehouseMapper.xml
@@ -0,0 +1,23 @@
+<?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.RepairWarehouseMapper">
+
+ <select id="getColumnDateList" resultType="java.lang.String">
+ select
+ distinct ${repairWarehouse.column}
+ from eam_repair_warehouse
+ where del_flag = '0'
+ <if test="repairWarehouse.faultType != null and repairWarehouse.faultType != '' ">
+ AND fault_type = #{repairWarehouse.faultType}
+ </if>
+ <if test="repairWarehouse.faultPart != null and repairWarehouse.faultPart != '' ">
+ AND fault_part LIKE CONCAT(CONCAT('%',#{repairWarehouse.faultPart}),'%')
+ </if>
+ <if test="repairWarehouse.faultChildPart != null and repairWarehouse.faultChildPart != '' ">
+ AND fault_child_part LIKE CONCAT(CONCAT('%',#{repairWarehouse.faultChildPart}),'%')
+ </if>
+ <if test="repairWarehouse.repairDescription != null and repairWarehouse.repairDescription != '' ">
+ AND repair_description LIKE CONCAT(CONCAT('%',#{repairWarehouse.repairDescription}),'%')
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java
index 922934e..b9c1998 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java
@@ -5,6 +5,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import java.io.Serializable;
@@ -35,6 +36,33 @@
*/
@ApiModelProperty(value = "鏁呴殰鍘熷洜")
private String faultReason;
+
+ /**
+ * 鏁呴殰绫诲瀷
+ */
+ @ApiModelProperty(value = "鏁呴殰绫诲瀷")
+ @Dict(dicCode = "repair_warehouse_fault_type")
+ private String faultType;
+
+ /**
+ * 鏁呴殰閮ㄤ綅
+ */
+ @ApiModelProperty(value = "鏁呴殰閮ㄤ綅")
+ private String faultPart;
+
+ /**
+ * 鏁呴殰瀛愰儴浣�
+ */
+ @ApiModelProperty(value = "鏁呴殰瀛愰儴浣�")
+ private String faultChildPart;
+
+ /**
+ * 涓ラ噸绋嬪害
+ */
+ @ApiModelProperty(value = "涓ラ噸绋嬪害")
+ @Dict(dicCode = "repair_severity")
+ private String severity;
+
/**
* 缁翠慨缁撴灉鎻忚堪
*/
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IRepairWarehouseService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IRepairWarehouseService.java
new file mode 100644
index 0000000..519a9ef
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IRepairWarehouseService.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.eam.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.RepairWarehouse;
+
+import java.util.List;
+
+/**
+ * @Description: eam_repair_warehouse
+ * @Author: jeecg-boot
+ * @Date: 2025-09-05
+ * @Version: V1.0
+ */
+public interface IRepairWarehouseService extends IService<RepairWarehouse> {
+
+ void add(RepairWarehouse repairWarehouse);
+
+ void saveData(RepairWarehouse repairWarehouse);
+
+ void edit(RepairWarehouse repairWarehouse);
+
+ List<String> getColumnDateList(RepairWarehouse repairWarehouse);
+}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index 884f418..c0fac1b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -24,15 +24,13 @@
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportRepair;
+import org.jeecg.modules.eam.entity.RepairWarehouse;
import org.jeecg.modules.eam.mapper.EamRepairOrderMapper;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.request.EamRepairOrderRequest;
import org.jeecg.modules.eam.request.EamRepairOrderResponse;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
-import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamRepairOrderService;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.util.DateUtils;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
@@ -91,6 +89,9 @@
@Autowired
private ISysUserService sysUserService;
+
+ @Autowired
+ private IRepairWarehouseService repairWarehouseService;
/**
* 鍒嗛〉鍒楄〃
@@ -299,6 +300,8 @@
Map<String, Object> values = new HashMap<>();
List<UserSelector> userSelectors;
List<String> userApprovalList;
+
+ RepairWarehouse repairWarehouse = null;
switch (status) {
case WAIT_INTERNAL_CONFIRM:
order.setRepairConfirm(request.getRepairConfirm());
@@ -345,6 +348,17 @@
order.setFaultReason(request.getFaultReason());
order.setRepairDescription(request.getRepairDescription());
order.setActualEndTime(new Date());
+ order.setFaultType(request.getFaultType());
+ order.setFaultPart(request.getFaultPart());
+ order.setFaultChildPart(request.getFaultChildPart());
+ order.setSeverity(request.getSeverity());
+ order.setRepairDescription(request.getRepairDescription());
+
+ //淇濆瓨缁翠慨鐭ヨ瘑搴�
+ repairWarehouse = new RepairWarehouse();
+ BeanUtils.copyProperties(request, repairWarehouse);
+ repairWarehouseService.saveData(repairWarehouse);
+
// 澶勭悊闄勪欢
if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -432,6 +446,17 @@
order.setFaultReason(request.getFaultReason());
order.setRepairDescription(request.getRepairDescription());
order.setActualEndTime(new Date());
+ order.setFaultType(request.getFaultType());
+ order.setFaultPart(request.getFaultPart());
+ order.setFaultChildPart(request.getFaultChildPart());
+ order.setSeverity(request.getSeverity());
+ order.setRepairDescription(request.getRepairDescription());
+
+ //淇濆瓨缁翠慨鐭ヨ瘑搴�
+ repairWarehouse = new RepairWarehouse();
+ BeanUtils.copyProperties(request, repairWarehouse);
+ repairWarehouseService.saveData(repairWarehouse);
+
// 澶勭悊闄勪欢
if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -459,6 +484,17 @@
order.setFaultReason(request.getFaultReason());
order.setRepairDescription(request.getRepairDescription());
order.setActualEndTime(new Date());
+ order.setFaultType(request.getFaultType());
+ order.setFaultPart(request.getFaultPart());
+ order.setFaultChildPart(request.getFaultChildPart());
+ order.setSeverity(request.getSeverity());
+ order.setRepairDescription(request.getRepairDescription());
+
+ //淇濆瓨缁翠慨鐭ヨ瘑搴�
+ repairWarehouse = new RepairWarehouse();
+ BeanUtils.copyProperties(request, repairWarehouse);
+ repairWarehouseService.saveData(repairWarehouse);
+
// 澶勭悊闄勪欢
if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/RepairWarehouseServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/RepairWarehouseServiceImpl.java
new file mode 100644
index 0000000..18b72bf
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/RepairWarehouseServiceImpl.java
@@ -0,0 +1,105 @@
+package org.jeecg.modules.eam.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.eam.entity.RepairWarehouse;
+import org.jeecg.modules.eam.mapper.RepairWarehouseMapper;
+import org.jeecg.modules.eam.service.IRepairWarehouseService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Description: eam_repair_warehouse
+ * @Author: jeecg-boot
+ * @Date: 2025-09-05
+ * @Version: V1.0
+ */
+@Service
+@Slf4j
+public class RepairWarehouseServiceImpl extends ServiceImpl<RepairWarehouseMapper, RepairWarehouse> implements IRepairWarehouseService {
+
+ // 瀹氫箟鍚堟硶鐨勫瓧娈靛悕鐧藉悕鍗�
+ private static final List<String> ALLOWED_COLUMNS = Arrays.asList(
+ "fault_part", "fault_child_part", "repair_description"
+ );
+ /**
+ * 淇濆瓨鏁版嵁
+ * @param repairWarehouse
+ */
+ @Override
+ public void add(RepairWarehouse repairWarehouse) {
+ checkData(repairWarehouse);
+ this.save(repairWarehouse);
+ }
+
+ @Override
+ public void saveData(RepairWarehouse repairWarehouse) {
+
+ RepairWarehouse warehouse = this.getOne(new LambdaQueryWrapper<RepairWarehouse>()
+ .eq(RepairWarehouse::getFaultType, repairWarehouse.getFaultType())
+ .eq(RepairWarehouse::getFaultPart, repairWarehouse.getFaultPart())
+ .eq(RepairWarehouse::getFaultChildPart, repairWarehouse.getFaultChildPart())
+ .eq(RepairWarehouse::getRepairDescription, repairWarehouse.getRepairDescription())
+ );
+
+ if(Objects.isNull(warehouse)) {
+ this.save(repairWarehouse);
+ }
+ }
+
+ @Override
+ public void edit(RepairWarehouse repairWarehouse) {
+ checkData(repairWarehouse);
+ this.updateById(repairWarehouse);
+ }
+
+ @Override
+ public List<String> getColumnDateList(RepairWarehouse repairWarehouse) {
+
+ if (StringUtils.isBlank(repairWarehouse.getColumn()) || !ALLOWED_COLUMNS.contains(repairWarehouse.getColumn())) {
+ throw new JeecgBootException("鎵�闇�鏌ヨ瀛楁鍊兼棤鏁�");
+ }
+ return this.baseMapper.getColumnDateList(repairWarehouse);
+ }
+
+ private void checkData(RepairWarehouse repairWarehouse) {
+
+ if(Objects.isNull(repairWarehouse)) {
+ throw new JeecgBootException("鏁版嵁涓嶈兘涓虹┖");
+ }
+
+ if (StringUtils.isBlank(repairWarehouse.getFaultType())) {
+ throw new JeecgBootException("鏁呴殰绫诲瀷涓嶈兘涓虹┖");
+ }
+
+ if (StringUtils.isBlank(repairWarehouse.getFaultPart())) {
+ throw new JeecgBootException("鏁呴殰閮ㄤ綅涓嶈兘涓虹┖");
+ }
+
+ if (StringUtils.isBlank(repairWarehouse.getFaultChildPart())) {
+ throw new JeecgBootException("鏁呴殰瀛愰儴浣嶄笉鑳戒负绌�");
+ }
+
+ if (StringUtils.isBlank(repairWarehouse.getRepairDescription())) {
+ throw new JeecgBootException("缁翠慨鎻忚堪涓嶈兘涓虹┖");
+ }
+
+ RepairWarehouse warehouse = this.getOne(new LambdaQueryWrapper<RepairWarehouse>()
+ .eq(RepairWarehouse::getFaultType, repairWarehouse.getFaultType())
+ .eq(RepairWarehouse::getFaultPart, repairWarehouse.getFaultPart())
+ .eq(RepairWarehouse::getFaultChildPart, repairWarehouse.getFaultChildPart())
+ .eq(RepairWarehouse::getRepairDescription, repairWarehouse.getRepairDescription())
+ .le(StringUtils.isNotEmpty(repairWarehouse.getId()), RepairWarehouse::getId, repairWarehouse.getId())
+ );
+
+ if(Objects.nonNull(warehouse)) {
+ throw new JeecgBootException("宸插瓨鍦ㄨ鐭ヨ瘑搴�");
+ }
+ }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairWarehouseController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairWarehouseController.java
new file mode 100644
index 0000000..74c67fa
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairWarehouseController.java
@@ -0,0 +1,176 @@
+package org.jeecg.modules.eam.controller;
+
+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.entity.RepairWarehouse;
+import org.jeecg.modules.eam.service.IRepairWarehouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description: eam_repair_warehouse
+ * @Author: jeecg-boot
+ * @Date: 2025-09-05
+ * @Version: V1.0
+ */
+@Api(tags="缁翠慨鐭ヨ瘑搴�")
+@RestController
+@RequestMapping("/repairWarehouse/repairWarehouse")
+@Slf4j
+public class RepairWarehouseController extends JeecgController<RepairWarehouse, IRepairWarehouseService> {
+ @Autowired
+ private IRepairWarehouseService repairWarehouseService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param repairWarehouse
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "eam_repair_warehouse-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="eam_repair_warehouse-鍒嗛〉鍒楄〃鏌ヨ", notes="eam_repair_warehouse-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<RepairWarehouse>> queryPageList(RepairWarehouse repairWarehouse,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<RepairWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(repairWarehouse, req.getParameterMap());
+ Page<RepairWarehouse> page = new Page<RepairWarehouse>(pageNo, pageSize);
+ IPage<RepairWarehouse> pageList = repairWarehouseService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 璁惧缁翠慨娴佺▼-鏍规嵁鏌ヨ鏉′欢鏌ヨ鎸囧畾瀛楁鏁版嵁
+ *
+ * @param repairWarehouse
+ * @return
+ */
+ //@AutoLog(value = "eam_repair_warehouse-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="鏍规嵁鏌ヨ鏉′欢鏌ヨ鎸囧畾瀛楁鏁版嵁", notes="鏍规嵁鏌ヨ鏉′欢鏌ヨ鎸囧畾瀛楁鏁版嵁")
+ @GetMapping(value = "/getColumnDateList")
+ public Result<?> getColumnDateList(RepairWarehouse repairWarehouse) {
+ List<String> list = repairWarehouseService.getColumnDateList(repairWarehouse);
+ return Result.OK(list);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param repairWarehouse
+ * @return
+ */
+ @AutoLog(value = "eam_repair_warehouse-娣诲姞")
+ @ApiOperation(value="eam_repair_warehouse-娣诲姞", notes="eam_repair_warehouse-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody RepairWarehouse repairWarehouse) {
+ repairWarehouseService.add(repairWarehouse);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param repairWarehouse
+ * @return
+ */
+ @AutoLog(value = "eam_repair_warehouse-缂栬緫")
+ @ApiOperation(value="eam_repair_warehouse-缂栬緫", notes="eam_repair_warehouse-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody RepairWarehouse repairWarehouse) {
+ repairWarehouseService.edit(repairWarehouse);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "eam_repair_warehouse-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="eam_repair_warehouse-閫氳繃id鍒犻櫎", notes="eam_repair_warehouse-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ repairWarehouseService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "eam_repair_warehouse-鎵归噺鍒犻櫎")
+ @ApiOperation(value="eam_repair_warehouse-鎵归噺鍒犻櫎", notes="eam_repair_warehouse-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.repairWarehouseService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "eam_repair_warehouse-閫氳繃id鏌ヨ")
+ @ApiOperation(value="eam_repair_warehouse-閫氳繃id鏌ヨ", notes="eam_repair_warehouse-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<RepairWarehouse> queryById(@RequestParam(name="id",required=true) String id) {
+ RepairWarehouse repairWarehouse = repairWarehouseService.getById(id);
+ if(repairWarehouse==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(repairWarehouse);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param repairWarehouse
+ */
+ //@RequiresPermissions("org.jeecg.modules:eam_repair_warehouse:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, RepairWarehouse repairWarehouse) {
+ return super.exportXls(request, repairWarehouse, RepairWarehouse.class, "eam_repair_warehouse");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("eam_repair_warehouse:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, RepairWarehouse.class);
+ }
+
+}
--
Gitblit v1.9.3