From 5cccd878f9be614d1f2f7ff66df5d8762f603281 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期六, 05 七月 2025 17:13:18 +0800
Subject: [PATCH] 点检工单新增编辑
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
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
index c5a3769..9697509 100644
--- 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
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -15,10 +16,12 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.request.EamInspectionBatchApprovalRequest;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
@@ -27,16 +30,13 @@
import org.jeecg.modules.eam.vo.InspectionVo;
import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @Description: 鐐规宸ュ崟
@@ -49,15 +49,16 @@
@RequestMapping("/eam/eamInspectionOrder")
@Slf4j
public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
- @Autowired
+
+ @Resource
private IEamInspectionOrderService eamInspectionOrderService;
- @Autowired
+ @Resource
private ISysBusinessCodeRuleService businessCodeRuleService;
- @Autowired
+ @Resource
private ObjectMapper objectMapper;
- @Autowired
+ @Resource
private TranslateDictTextUtils translateDictTextUtils;
- @Autowired
+ @Resource
private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
/**
@@ -69,14 +70,12 @@
* @param req
* @return
*/
- //@AutoLog(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "鐐规宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,
@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.queryPageList(page, query);
return Result.OK(pageList);
@@ -282,7 +281,6 @@
* @param id
* @return
*/
- //@AutoLog(value = "鐐规宸ュ崟-閫氳繃id鏌ヨ")
@ApiOperation(value = "鐐规宸ュ崟-閫氳繃id鏌ヨ", notes = "鐐规宸ュ崟-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -300,6 +298,7 @@
translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
+ translateDictTextUtils.translateField("equipmentCode", eamInspectionOrder.getEquipmentId(), item, "eam_equipment,id,equipment_code");
return Result.OK(item);
} catch (JsonProcessingException e) {
return Result.error("鏁版嵁杞瘧澶辫触锛�");
--
Gitblit v1.9.3