From abe2c2fbea21d63678bc21bd77f3102a2b535973 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 22 五月 2025 10:28:35 +0800
Subject: [PATCH] art: 设备管理-三保-列表、新增修改，增加精度参数明细项
---
db/数据库产品化设计.pdma.json | 38 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java | 43 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java | 202 ++++++++------------------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java | 16 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java | 9 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 10 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java | 10 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentPrecisionParametersService.java | 9 +
9 files changed, 184 insertions(+), 158 deletions(-)
diff --git "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json" "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
index 040d053..cd164d3 100644
--- "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
+++ "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
@@ -9136,7 +9136,25 @@
"id": "A0BDDC8D-57C6-4021-966A-BA5098035FDE"
},
{
- "defKey": "equipment_precision_id",
+ "defKey": "equipment_id",
+ "defName": "璁惧ID",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "id": "1BB5AD12-4251-4DEE-82C5-4BB725C69714"
+ },
+ {
+ "defKey": "parameter_id",
"defName": "绮惧害鍙傛暟id",
"comment": "",
"type": "",
@@ -9154,6 +9172,24 @@
"id": "AC662F40-C243-4072-BD4D-8CBB465C2B41"
},
{
+ "defKey": "parameter_value",
+ "defName": "鍏佸樊鍊�(mm)",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "51EB67FF-6C51-4E31-A599-7C79AA38BF12"
+ },
+ {
"defKey": "actual_value",
"defName": "瀹炴祴鍊�",
"comment": "",
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
index 9321f6a..b879e2f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentPrecisionParametersController.java
@@ -1,22 +1,30 @@
package org.jeecg.modules.eam.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
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.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
import org.jeecg.modules.eam.service.IEamEquipmentPrecisionParametersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
- /**
+/**
* @Description: 璁惧绮惧害鍙傛暟
* @Author: jeecg-boot
* @Date: 2025-04-27
@@ -29,6 +37,10 @@
public class EamEquipmentPrecisionParametersController extends JeecgController<EamEquipmentPrecisionParameters, IEamEquipmentPrecisionParametersService> {
@Autowired
private IEamEquipmentPrecisionParametersService eamEquipmentPrecisionParametersService;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -113,4 +125,33 @@
this.eamEquipmentPrecisionParametersService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
}
+
+
+ /**
+ * 鍒楄〃鏌ヨ
+ *
+ * @param equipmentId 璁惧ID
+ * @return
+ */
+ @ApiOperation(value="璁惧绮惧害鍙傛暟-鍒楄〃鏌ヨ", notes="璁惧绮惧害鍙傛暟-鍒楄〃鏌ヨ")
+ @GetMapping(value = "/queryList")
+ public Result<?> queryList(@RequestParam(name="equipmentId") String equipmentId) {
+ List<EamEquipmentPrecisionParameters> list = eamEquipmentPrecisionParametersService.queryList(equipmentId);
+ if(CollectionUtil.isEmpty(list)) {
+ return Result.OK(Collections.emptyList());
+ }
+ List<JSONObject> items = new ArrayList<>();
+ try {
+ for(EamEquipmentPrecisionParameters vo : list) {
+ String json = objectMapper.writeValueAsString(vo);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("parameterId", vo.getParameterId(), item, "eam_precision_parameters,parameter_name,id");
+ translateDictTextUtils.translateField("parameterCode", vo.getParameterId(), item, "eam_precision_parameters,parameter_code,id");
+ items.add(item);
+ }
+ return Result.OK(items);
+ }catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java
index 12bce48..c4245dd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionCheckDetailController.java
@@ -1,41 +1,29 @@
package org.jeecg.modules.eam.controller;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
-import org.jeecg.modules.eam.service.IEamPrecisionCheckDetailService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.fasterxml.jackson.databind.ObjectMapper;
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.common.util.TranslateDictTextUtils;
+import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
+import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
+import org.jeecg.modules.eam.service.IEamPrecisionCheckDetailService;
+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.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
* @Description: 璁惧绮惧害妫�娴嬫槑缁�
* @Author: jeecg-boot
* @Date: 2025-05-13
@@ -44,124 +32,40 @@
@Slf4j
@Api(tags="璁惧绮惧害妫�娴嬫槑缁�")
@RestController
-@RequestMapping("/eam/eamPrecisionCheckDetail")
+@RequestMapping("/eam/precisionCheckDetail")
public class EamPrecisionCheckDetailController extends JeecgController<EamPrecisionCheckDetail, IEamPrecisionCheckDetailService> {
@Autowired
private IEamPrecisionCheckDetailService eamPrecisionCheckDetailService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamPrecisionCheckDetail
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "璁惧绮惧害妫�娴嬫槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧绮惧害妫�娴嬫槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧绮惧害妫�娴嬫槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamPrecisionCheckDetail eamPrecisionCheckDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamPrecisionCheckDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamPrecisionCheckDetail, req.getParameterMap());
- Page<EamPrecisionCheckDetail> page = new Page<EamPrecisionCheckDetail>(pageNo, pageSize);
- IPage<EamPrecisionCheckDetail> pageList = eamPrecisionCheckDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamPrecisionCheckDetail
- * @return
- */
- @AutoLog(value = "璁惧绮惧害妫�娴嬫槑缁�-娣诲姞")
- @ApiOperation(value="璁惧绮惧害妫�娴嬫槑缁�-娣诲姞", notes="璁惧绮惧害妫�娴嬫槑缁�-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamPrecisionCheckDetail eamPrecisionCheckDetail) {
- eamPrecisionCheckDetailService.save(eamPrecisionCheckDetail);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamPrecisionCheckDetail
- * @return
- */
- @AutoLog(value = "璁惧绮惧害妫�娴嬫槑缁�-缂栬緫")
- @ApiOperation(value="璁惧绮惧害妫�娴嬫槑缁�-缂栬緫", notes="璁惧绮惧害妫�娴嬫槑缁�-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamPrecisionCheckDetail eamPrecisionCheckDetail) {
- eamPrecisionCheckDetailService.updateById(eamPrecisionCheckDetail);
- 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) {
- eamPrecisionCheckDetailService.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.eamPrecisionCheckDetailService.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) {
- EamPrecisionCheckDetail eamPrecisionCheckDetail = eamPrecisionCheckDetailService.getById(id);
- return Result.OK(eamPrecisionCheckDetail);
- }
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamPrecisionCheckDetail
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamPrecisionCheckDetail eamPrecisionCheckDetail) {
- return super.exportXls(request, eamPrecisionCheckDetail, EamPrecisionCheckDetail.class, "璁惧绮惧害妫�娴嬫槑缁�");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamPrecisionCheckDetail.class);
- }
-
+ /**
+ * 鍒楄〃鏌ヨ
+ *
+ * @param orderId 宸ュ崟ID
+ * @return
+ */
+ @ApiOperation(value="璁惧绮惧害鍙傛暟-鍒楄〃鏌ヨ", notes="璁惧绮惧害鍙傛暟-鍒楄〃鏌ヨ")
+ @GetMapping(value = "/queryList")
+ public Result<?> queryList(@RequestParam(name="orderId") String orderId) {
+ List<EamPrecisionCheckDetail> list = eamPrecisionCheckDetailService.getByOrderId(orderId);
+ if(CollectionUtil.isEmpty(list)) {
+ return Result.OK(Collections.emptyList());
+ }
+ List<JSONObject> items = new ArrayList<>();
+ try {
+ for(EamPrecisionCheckDetail vo : list) {
+ String json = objectMapper.writeValueAsString(vo);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("parameterId", vo.getParameterId(), item, "eam_precision_parameters,parameter_name,id");
+ translateDictTextUtils.translateField("parameterCode", vo.getParameterId(), item, "eam_precision_parameters,parameter_code,id");
+ items.add(item);
+ }
+ return Result.OK(items);
+ }catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java
index 315b587..fcf65a8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java
@@ -57,10 +57,20 @@
@ApiModelProperty(value = "宸ュ崟ID")
private String orderId;
/**
- * 璁惧鍙傛暟id
+ * 璁惧ID
*/
- @ApiModelProperty(value = "璁惧鍙傛暟id")
- private String equipmentPrecisionId;
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**
+ * 鍙傛暟id
+ */
+ @ApiModelProperty(value = "鍙傛暟id")
+ private String parameterId;
+ /**
+ * 鍏佸樊鍊�(mm)
+ */
+ @ApiModelProperty(value = "鍏佸樊鍊�(mm)")
+ private String parameterValue;
/**
* 瀹炴祴鍊�
*/
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
index 5cdd7ce..959f6cb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
@@ -7,6 +7,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
+import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.springframework.format.annotation.DateTimeFormat;
@@ -60,6 +61,14 @@
@ApiModelProperty(value = "鍒犻櫎 淇濆吇椤规槑缁�")
private List<EamThirdMaintenanceOrderDetail> removeDetailList;
+ /**鍒楄〃 绮惧害鍙傛暟鏄庣粏*/
+ @ApiModelProperty(value = "鍒楄〃 绮惧害鍙傛暟鏄庣粏")
+ private List<EamPrecisionCheckDetail> precisionDetailList;
+ /**鍒犻櫎 绮惧害鍙傛暟鏄庣粏*/
+ @ApiModelProperty(value = "鍒犻櫎 绮惧害鍙傛暟鏄庣粏")
+ private List<EamPrecisionCheckDetail> removePrecisionDetailList;
+
+
//纭鎿嶄綔
/**纭鎰忚*/
@ApiModelProperty(value = "纭鎰忚")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentPrecisionParametersService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentPrecisionParametersService.java
index 62daac0..bfefaa8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentPrecisionParametersService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentPrecisionParametersService.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.EamEquipmentPrecisionParameters;
+import java.util.List;
+
/**
* @Description: 璁惧绮惧害鍙傛暟
* @Author: jeecg-boot
@@ -27,4 +29,11 @@
* @return
*/
IPage<EamEquipmentPrecisionParameters> queryPageList(String equipmentId, Page<EamEquipmentPrecisionParameters> page);
+
+ /**
+ * 鍒楄〃鏌ヨ
+ * @param equipmentId
+ * @return
+ */
+ List<EamEquipmentPrecisionParameters> queryList(String equipmentId);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java
index 59aeb20..835bcb7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentPrecisionParametersServiceImpl.java
@@ -11,6 +11,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
/**
* @Description: 璁惧绮惧害鍙傛暟
@@ -39,4 +41,12 @@
queryWrapper.orderByDesc("wmo.create_time");
return eamEquipmentPrecisionParametersMapper.queryPageList(page, queryWrapper);
}
+
+ @Override
+ public List<EamEquipmentPrecisionParameters> queryList(String equipmentId) {
+ LambdaQueryWrapper<EamEquipmentPrecisionParameters> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamEquipmentPrecisionParameters::getEquipmentId, equipmentId);
+ queryWrapper.orderByDesc(EamEquipmentPrecisionParameters::getCreateTime);
+ return eamEquipmentPrecisionParametersMapper.selectList(queryWrapper);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java
index 237328d..cda6eb5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java
@@ -8,7 +8,6 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Collections;
import java.util.List;
/**
@@ -25,7 +24,9 @@
@Override
public List<EamPrecisionCheckDetail> getByOrderId(String orderId) {
- return Collections.emptyList();
+ LambdaQueryWrapper<EamPrecisionCheckDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamPrecisionCheckDetail::getOrderId, orderId);
+ return eamPrecisionCheckDetailMapper.selectList(queryWrapper);
}
@Override
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index 16c529a..6840c49 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -156,8 +156,14 @@
});
thirdMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
}
- //澶勭悊绮惧害鍙傛暟 TODO
-
+ //澶勭悊绮惧害鍙傛暟
+ if (CollectionUtil.isNotEmpty(request.getPrecisionDetailList())) {
+ request.getPrecisionDetailList().forEach(tableDetail -> {
+ tableDetail.setId(null);
+ tableDetail.setOrderId(order.getId());
+ });
+ precisionCheckDetailService.saveBatch(request.getPrecisionDetailList());
+ }
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
if (StringUtils.isNotBlank(order.getOperator())) {
//鍚姩娴佺▼ TODO
--
Gitblit v1.9.3