From 63a24908dd2bca035d9f26fe071266d548048cdd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 02 四月 2025 17:37:53 +0800
Subject: [PATCH] 新增点检工单、swagger配置，新增用户拥有标准查询
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderDetailMapper.xml | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderDetailService.java | 14 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java | 161 ++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardMapper.java | 15
lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java | 18 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderDetailMapper.java | 14 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java | 14 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 13
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderDetailServiceImpl.java | 18 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml | 27 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 124 +++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java | 12
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 18 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java | 79 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 15 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 161 ++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java | 14 +
18 files changed, 721 insertions(+), 6 deletions(-)
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
index 59effd1..1fb1a97 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
@@ -160,6 +160,24 @@
.groupName("闆嗘垚");
}
+ @Bean(value = "defaultApiEam")
+ public Docket activitiApiEam() {
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(apiInfo())
+ .select()
+ //姝ゅ寘璺緞涓嬬殑绫伙紝鎵嶇敓鎴愭帴鍙ｆ枃妗�
+ .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.eam"))
+ //鍔犱簡ApiOperation娉ㄨВ鐨勭被锛屾墠鐢熸垚鎺ュ彛鏂囨。
+ .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
+ .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .paths(PathSelectors.any())
+ .build()
+ .securitySchemes(Collections.singletonList(securityScheme()))
+ .securityContexts(securityContexts())
+ .globalOperationParameters(setHeaderToken())
+ .groupName("eam");
+ }
+
/***
* oauth2閰嶇疆
* 闇�瑕佸鍔爏wagger鎺堟潈鍥炶皟鍦板潃
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
new file mode 100644
index 0000000..8c1431c
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -0,0 +1,161 @@
+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.EamInspectionOrder;
+import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+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;
+
+ /**
+ * @Description: 鐐规宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Api(tags="鐐规宸ュ崟")
+@RestController
+@RequestMapping("/eam/eamInspectionOrder")
+@Slf4j
+public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
+ @Autowired
+ private IEamInspectionOrderService eamInspectionOrderService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamInspectionOrder
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes="鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrder eamInspectionOrder,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
+ Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);
+ IPage<EamInspectionOrder> pageList = eamInspectionOrderService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param eamInspectionOrder
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-娣诲姞")
+ @ApiOperation(value="鐐规宸ュ崟-娣诲姞", notes="鐐规宸ュ崟-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody EamInspectionOrder eamInspectionOrder) {
+ eamInspectionOrderService.save(eamInspectionOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param eamInspectionOrder
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-缂栬緫")
+ @ApiOperation(value="鐐规宸ュ崟-缂栬緫", notes="鐐规宸ュ崟-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody EamInspectionOrder eamInspectionOrder) {
+ eamInspectionOrderService.updateById(eamInspectionOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="鐐规宸ュ崟-閫氳繃id鍒犻櫎", notes="鐐规宸ュ崟-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ eamInspectionOrderService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鐐规宸ュ崟-鎵归噺鍒犻櫎", notes="鐐规宸ュ崟-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.eamInspectionOrderService.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<EamInspectionOrder> queryById(@RequestParam(name="id",required=true) String id) {
+ EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id);
+ if(eamInspectionOrder==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(eamInspectionOrder);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param eamInspectionOrder
+ */
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) {
+ return super.exportXls(request, eamInspectionOrder, EamInspectionOrder.class, "鐐规宸ュ崟");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("鐐规宸ュ崟:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, EamInspectionOrder.class);
+ }
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java
new file mode 100644
index 0000000..a5168af
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderDetailController.java
@@ -0,0 +1,161 @@
+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.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
+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;
+
+ /**
+ * @Description: 鐐规宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Api(tags="鐐规宸ュ崟鏄庣粏")
+@RestController
+@RequestMapping("/eam/eamInspectionOrderDetail")
+@Slf4j
+public class EamInspectionOrderDetailController extends JeecgController<EamInspectionOrderDetail, IEamInspectionOrderDetailService> {
+ @Autowired
+ private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamInspectionOrderDetail
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鐐规宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="鐐规宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes="鐐规宸ュ崟鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<EamInspectionOrderDetail>> queryPageList(EamInspectionOrderDetail eamInspectionOrderDetail,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<EamInspectionOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrderDetail, req.getParameterMap());
+ Page<EamInspectionOrderDetail> page = new Page<EamInspectionOrderDetail>(pageNo, pageSize);
+ IPage<EamInspectionOrderDetail> pageList = eamInspectionOrderDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param eamInspectionOrderDetail
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟鏄庣粏-娣诲姞")
+ @ApiOperation(value="鐐规宸ュ崟鏄庣粏-娣诲姞", notes="鐐规宸ュ崟鏄庣粏-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟鏄庣粏:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody EamInspectionOrderDetail eamInspectionOrderDetail) {
+ eamInspectionOrderDetailService.save(eamInspectionOrderDetail);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param eamInspectionOrderDetail
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟鏄庣粏-缂栬緫")
+ @ApiOperation(value="鐐规宸ュ崟鏄庣粏-缂栬緫", notes="鐐规宸ュ崟鏄庣粏-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟鏄庣粏:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody EamInspectionOrderDetail eamInspectionOrderDetail) {
+ eamInspectionOrderDetailService.updateById(eamInspectionOrderDetail);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟鏄庣粏-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="鐐规宸ュ崟鏄庣粏-閫氳繃id鍒犻櫎", notes="鐐规宸ュ崟鏄庣粏-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟鏄庣粏:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ eamInspectionOrderDetailService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鐐规宸ュ崟鏄庣粏-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鐐规宸ュ崟鏄庣粏-鎵归噺鍒犻櫎", notes="鐐规宸ュ崟鏄庣粏-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟鏄庣粏:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.eamInspectionOrderDetailService.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<EamInspectionOrderDetail> queryById(@RequestParam(name="id",required=true) String id) {
+ EamInspectionOrderDetail eamInspectionOrderDetail = eamInspectionOrderDetailService.getById(id);
+ if(eamInspectionOrderDetail==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(eamInspectionOrderDetail);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param eamInspectionOrderDetail
+ */
+ //@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟鏄庣粏:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrderDetail eamInspectionOrderDetail) {
+ return super.exportXls(request, eamInspectionOrderDetail, EamInspectionOrderDetail.class, "鐐规宸ュ崟鏄庣粏");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("鐐规宸ュ崟鏄庣粏:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, EamInspectionOrderDetail.class);
+ }
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index 6d41772..4623e8a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -159,6 +159,21 @@
}
/**
+ * 鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯
+ * @param keyword 璁惧缂栧彿
+ * @param maintenanceCategory 淇濆吇绫诲瀷
+ * @return
+ */
+ @AutoLog(value = "淇濆吇鏍囧噯-鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯")
+ @ApiOperation(value = "淇濆吇鏍囧噯-鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯", notes = "淇濆吇鏍囧噯-鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯")
+ @GetMapping(value = "/listByUser")
+ public Result<?> listByUser(@RequestParam(name = "keyword", required = false) String keyword,
+ @RequestParam(name = "maintenanceCategory", required = false) String maintenanceCategory) {
+ List<EamMaintenanceStandard> list = eamMaintenanceStandardService.queryListBykeywordAndCategory(keyword, maintenanceCategory);
+ return Result.OK(list);
+ }
+
+ /**
* 閫氳繃id鍒犻櫎
*
* @param id
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
new file mode 100644
index 0000000..fb934c4
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -0,0 +1,124 @@
+package org.jeecg.modules.eam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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_inspection_order")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="eam_inspection_order瀵硅薄", description="鐐规宸ュ崟")
+public class EamInspectionOrder implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ 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;
+ /**宸ュ崟鍙�*/
+ @Excel(name = "宸ュ崟鍙�", width = 15)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String orderNum;
+ /**璁惧ID*/
+ @Excel(name = "璁惧ID", width = 15)
+ @ApiModelProperty(value = "璁惧ID")
+ @Dict(dictTable = "eam_equipment", dicCode = "equipment_code", dicText = "id")
+ private String equipmentId;
+ /**鏍囧噯ID*/
+ @Excel(name = "淇濆吇鏍囧噯ID", width = 15)
+ @ApiModelProperty(value = "淇濆吇鏍囧噯ID")
+ @Dict(dictTable = "eam_maintenance_standard", dicCode = "standard_code", dicText = "id")
+ private String standardId;
+ /**鐐规鏃ユ湡*/
+ @Excel(name = "鐐规鏃ユ湡锛堣鍒掞級", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鐐规鏃ユ湡")
+ private Date inspectionDate;
+ /**鐐规杩囨湡鏃堕棿*/
+ @Excel(name = "鐐规杩囨湡鏃堕棿", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鐐规杩囨湡鏃堕棿")
+ private Date expirationTime;
+ /**鐐规鏃堕棿*/
+ @Excel(name = "鐐规鏃堕棿锛堝疄闄咃級", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鐐规鏃堕棿")
+ private Date operateTime;
+ /**鐐规浜�*/
+ @Excel(name = "鐐规浜�", width = 15)
+ @ApiModelProperty(value = "鐐规浜�-鏄鍙栦汉")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String operator;
+ /**鍒涘缓鏂瑰紡*/
+ @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
+ @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ private String creationMethod;
+ /**鐐规鐘舵��*/
+ @Excel(name = "鐐规鐘舵��", width = 15)
+ @ApiModelProperty(value = "鐐规鐘舵�� 寰呯偣妫�-寰呯‘璁�-宸插畬鎴�")
+ private String inspectionStatus;
+ /**鐝粍闀跨‘璁�*/
+ @Excel(name = "鐝粍闀跨‘璁�", width = 15)
+ @ApiModelProperty(value = "鐝粍闀跨‘璁�--棰嗗彇鍚庝骇鐢�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String confirmUser;
+ /**纭鏃堕棿*/
+ @Excel(name = "纭鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "纭鏃堕棿")
+ private Date confirmTime;
+ /**澶囨敞*/
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞")
+ private String remark;
+ /**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
+ @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧-鎵ц鏃�", width = 15)
+ @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
+ private String imageFiles;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
new file mode 100644
index 0000000..6b3be7f
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
@@ -0,0 +1,79 @@
+package org.jeecg.modules.eam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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.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_inspection_order_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="eam_inspection_order_detail瀵硅薄", description="鐐规宸ュ崟鏄庣粏")
+public class EamInspectionOrderDetail 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;
+ /**宸ュ崟ID*/
+ @Excel(name = "宸ュ崟ID", width = 15)
+ @ApiModelProperty(value = "宸ュ崟ID")
+ private String orderId;
+ /**鐐规椤笽D*/
+ @Excel(name = "鐐规椤笽D", width = 15)
+ @ApiModelProperty(value = "鐐规椤笽D")
+ private String itemId;
+ /**鐐规缁撴灉*/
+ @Excel(name = "鐐规缁撴灉", width = 15)
+ @ApiModelProperty(value = "鐐规缁撴灉-姝ｅ父-寮傚父")
+ private String inspectionResult;
+ /**寮傚父鎻忚堪*/
+ @Excel(name = "寮傚父鎻忚堪", width = 15)
+ @ApiModelProperty(value = "寮傚父鎻忚堪")
+ private String exceptionDescription;
+ /**寮傚父鏄惁淇濅慨*/
+ @Excel(name = "寮傚父鏄惁淇濅慨", width = 15)
+ @ApiModelProperty(value = "寮傚父鏄惁淇濅慨")
+ private String whetherWarranty;
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderDetailMapper.java
new file mode 100644
index 0000000..401a05e
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderDetailMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.eam.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+
+/**
+ * @Description: 鐐规宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+public interface EamInspectionOrderDetailMapper extends BaseMapper<EamInspectionOrderDetail> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java
new file mode 100644
index 0000000..f62c2a4
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamInspectionOrderMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.eam.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.eam.entity.EamInspectionOrder;
+
+/**
+ * @Description: 鐐规宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+public interface EamInspectionOrderMapper extends BaseMapper<EamInspectionOrder> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardMapper.java
index 3f841f9..5a0d83c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamMaintenanceStandardMapper.java
@@ -1,10 +1,10 @@
package org.jeecg.modules.eam.mapper;
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
/**
* @Description: 淇濆吇鏍囧噯
@@ -14,4 +14,13 @@
*/
public interface EamMaintenanceStandardMapper extends BaseMapper<EamMaintenanceStandard> {
+ /**
+ * 鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯
+ * @param userId 鐢ㄦ埛
+ * @param keyword 璁惧缂栧彿
+ * @param maintenanceCategory 淇濆吇绫诲瀷
+ * @return
+ */
+ List<EamMaintenanceStandard> queryListBykeywordAndCategory(@Param("userId")String userId ,@Param("keyword") String keyword, @Param("maintenanceCategory") String maintenanceCategory);
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderDetailMapper.xml
new file mode 100644
index 0000000..5a55b0f
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderDetailMapper.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.EamInspectionOrderDetailMapper">
+
+</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
new file mode 100644
index 0000000..a69ec96
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.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.EamInspectionOrderMapper">
+
+</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml
index fa971d4..81f990b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml
@@ -2,4 +2,29 @@
<!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.EamMaintenanceStandardMapper">
-</mapper>
\ No newline at end of file
+ <select id="queryListBykeywordAndCategory" resultType="org.jeecg.modules.eam.entity.EamMaintenanceStandard">
+ SELECT
+ m.*
+ FROM
+ eam_maintenance_standard m
+ WHERE
+ m.del_flag = 0
+ AND m.standard_status= 'NORMAL'
+ AND m.maintenance_category = #{maintenanceCategory}
+ AND EXISTS (
+ SELECT 1
+ FROM
+ eam_equipment e
+ INNER JOIN mdc_user_production t
+ ON t.user_id = #{userId}
+ AND t.pro_id = e.org_id -- 鍏宠仈鏉′欢绉诲埌JOIN涓�
+ WHERE
+ e.id = m.equipment_id
+ AND e.del_flag = 0
+ AND (
+ e.equipment_code LIKE CONCAT('%', #{keyword}, '%')
+ OR e.equipment_name LIKE CONCAT('%', #{keyword}, '%')
+ )
+ )
+ </select>
+</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderDetailService.java
new file mode 100644
index 0000000..07b2697
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderDetailService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.eam.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+
+/**
+ * @Description: 鐐规宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+public interface IEamInspectionOrderDetailService extends IService<EamInspectionOrderDetail> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
new file mode 100644
index 0000000..11f3831
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.eam.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamInspectionOrder;
+
+/**
+ * @Description: 鐐规宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+public interface IEamInspectionOrderService extends IService<EamInspectionOrder> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
index 33f761f..8890114 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
+
+import java.util.List;
/**
* @Description: 淇濆吇鏍囧噯
@@ -47,4 +49,12 @@
* @return
*/
EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory);
+
+ /**
+ * 鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯
+ * @param keyword 璁惧缂栧彿
+ * @param maintenanceCategory 淇濆吇绫诲瀷
+ * @return
+ */
+ List<EamMaintenanceStandard> queryListBykeywordAndCategory( String keyword, String maintenanceCategory);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderDetailServiceImpl.java
new file mode 100644
index 0000000..ae09fde
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderDetailServiceImpl.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.eam.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.mapper.EamInspectionOrderDetailMapper;
+import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 鐐规宸ュ崟鏄庣粏
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Service
+public class EamInspectionOrderDetailServiceImpl extends ServiceImpl<EamInspectionOrderDetailMapper, EamInspectionOrderDetail> implements IEamInspectionOrderDetailService {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
new file mode 100644
index 0000000..925a9f5
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -0,0 +1,18 @@
+package org.jeecg.modules.eam.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
+import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 鐐规宸ュ崟
+ * @Author: jeecg-boot
+ * @Date: 2025-04-02
+ * @Version: V1.0
+ */
+@Service
+public class EamInspectionOrderServiceImpl extends ServiceImpl<EamInspectionOrderMapper, EamInspectionOrder> implements IEamInspectionOrderService {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index af38a15..c8c4bcb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -2,7 +2,6 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -262,4 +261,16 @@
}
return list.get(0);
}
+
+ /**
+ * 鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯
+ * @param keyword 璁惧缂栧彿
+ * @param maintenanceCategory 淇濆吇绫诲瀷
+ * @return
+ */
+ @Override
+ public List<EamMaintenanceStandard> queryListBykeywordAndCategory(String keyword, String maintenanceCategory){
+ LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ return eamMaintenanceStandardMapper.queryListBykeywordAndCategory(loginUser.getId(),keyword, maintenanceCategory);
+ }
}
--
Gitblit v1.9.3