From f2e8dc200f4ec9c1021e908f65e6e1e458c2ef70 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期三, 25 十月 2023 13:19:39 +0800
Subject: [PATCH] 鉴定工单调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java | 441 ++++++++++++++++++++++++++++--------------------------
1 files changed, 230 insertions(+), 211 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
index 1672ae5..7297000 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.eam.controller;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -13,6 +10,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
@@ -20,7 +18,9 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.StrUtils;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.CalibrationOrder;
import org.jeecg.modules.eam.entity.CalibrationOrderReport;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentDocument;
import org.jeecg.modules.eam.service.ICalibrationOrderReportService;
@@ -29,6 +29,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.eam.service.ICalibrationOrderService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -46,194 +48,211 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
- /**
+/**
* @Description: mom_eam_calibration_order_report
* @Author: jeecg-boot
- * @Date: 2023-07-20
+ * @Date: 2023-07-20
* @Version: V1.0
*/
-@Api(tags="mom_eam_calibration_order_report")
+@Api(tags = "mom_eam_calibration_order_report")
@RestController
@RequestMapping("/eam/calibrationOrderReport")
@Slf4j
public class CalibrationOrderReportController extends JeecgController<CalibrationOrderReport, ICalibrationOrderReportService> {
- @Autowired
- private ICalibrationOrderReportService calibrationOrderReportService;
+ @Autowired
+ private ICalibrationOrderReportService calibrationOrderReportService;
- @Autowired
- private ISysBaseAPI sysBaseApi;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param calibrationOrderReport
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "mom_eam_calibration_order_report-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="mom_eam_calibration_order_report-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_calibration_order_report-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<CalibrationOrderReport>> queryPageList(CalibrationOrderReport calibrationOrderReport,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<CalibrationOrderReport> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrderReport, req.getParameterMap());
- Page<CalibrationOrderReport> page = new Page<CalibrationOrderReport>(pageNo, pageSize);
- IPage<CalibrationOrderReport> pageList = calibrationOrderReportService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
+ @Autowired
+ private ICalibrationOrderService calibrationOrderService;
+ @Autowired
+ private ISysBaseAPI sysBaseApi;
- /**
- * 娣诲姞
- *
- * @return
- */
- @PostMapping(value = "/add")
- @Transactional(rollbackFor = {Exception.class})
- public Result<?> add(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
- String str = request.getParameter("data");
- JSONObject json = JSONObject.parseObject(str);
-
- boolean isFileChange = true;
- String uploadId = json.getString("uploadId");
- String fileType = json.getString("fileType");
- String description = json.getString("remark");
- String type = json.getString("type");
-
- CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class);
- calibrationOrderReport.setType(fileType);
- calibrationOrderReportService.save(calibrationOrderReport);
- // 鏂囦欢鍙樻洿
- if (isFileChange) {
- if (StrUtils.isNotBlankOrNull(uploadId)) {
- // 鎯呭舰涓�銆佷粠鏂囦欢绠＄悊涓�夋嫨
-// uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
- } else {
- // 鎯呭舰浜屻�侀噸鏂颁笂浼�
- // 1銆佹寔涔卽pload
- MultipartFile multipartFile = request.getFile("file");
- List<MultipartFile> multipartFileList = new ArrayList<>();
- multipartFileList.add(multipartFile);
-// List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
-// // 2銆佸垱寤�/淇敼 uploadRela
-// // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲�
-// uploadRelaService.saveOrUpdateUploadRale(equipmentDocument.getId(), type, sysUploads.get(0).getId());
- List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);
- // 2銆佸垱寤�/淇敼 uploadRela
- // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲�
- sysBaseApi.saveOrUpdateUploadRale(calibrationOrderReport.getId(), type, sysUploads.get(0).getId());
- }
- }
-
- return Result.ok("涓婁紶鎴愬姛!");
- }
-
- @PostMapping(value = "/edit")
- @Transactional(rollbackFor = {Exception.class})
- public Result<?> edit(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
- String str = request.getParameter("data");
- JSONObject json = JSONObject.parseObject(str);
-
- boolean isFileChange = json.getBoolean("isFileChange");
- String uploadId = json.getString("uploadId");
- String fileType = json.getString("fileType");
- String description = json.getString("remark");
- String type = json.getString("type");
-
- CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class);
- calibrationOrderReport.setType(fileType);
- calibrationOrderReportService.saveOrUpdate(calibrationOrderReport);
- // 鏂囦欢鍙樻洿
- if (isFileChange) {
- if (StrUtils.isNotBlankOrNull(uploadId)) {
- // 鎯呭舰涓�銆佷粠鏂囦欢绠＄悊涓�夋嫨
-// uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
- } else {
- // 鎯呭舰浜屻�侀噸鏂颁笂浼�
- // 1銆佹寔涔卽pload
- MultipartFile multipartFile = request.getFile("file");
- List<MultipartFile> multipartFileList = new ArrayList<>();
- multipartFileList.add(multipartFile);
-// List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
-// // 2銆佸垱寤�/淇敼 uploadRela
-// // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲�
-// uploadRelaService.saveOrUpdateUploadRale(equipmentDocument.getId(), type, sysUploads.get(0).getId());
- List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);
- // 2銆佸垱寤�/淇敼 uploadRela
- // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲�
- sysBaseApi.saveOrUpdateUploadRale(calibrationOrderReport.getId(), type, sysUploads.get(0).getId());
- }
- }
-
- return Result.ok("涓婁紶鎴愬姛!");
- }
-
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "mom_eam_calibration_order_report-閫氳繃id鍒犻櫎")
- @ApiOperation(value="mom_eam_calibration_order_report-閫氳繃id鍒犻櫎", notes="mom_eam_calibration_order_report-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- //鍒犻櫎鏂囦欢绠＄悊涓庝笟鍔℃暟鎹叧绯�
-// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, id).eq(SysUploadRela::getDelFlag, 0).list();
- List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType(id, null);
- for (SysUploadRela sysUploadRela : sysUploadRelas) {
- String uploadId = sysUploadRela.getUploadId();
-// uploadService.removeById(uploadId);
-// uploadRelaService.removeById(sysUploadRela);
- sysBaseApi.removeUploadById(uploadId);
- sysBaseApi.removeUploadRelaById(sysUploadRela.getId());
- }
- calibrationOrderReportService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "mom_eam_calibration_order_report-鎵归噺鍒犻櫎")
- @ApiOperation(value="mom_eam_calibration_order_report-鎵归噺鍒犻櫎", notes="mom_eam_calibration_order_report-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.calibrationOrderReportService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "mom_eam_calibration_order_report-閫氳繃id鏌ヨ")
- @ApiOperation(value="mom_eam_calibration_order_report-閫氳繃id鏌ヨ", notes="mom_eam_calibration_order_report-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<CalibrationOrderReport> queryById(@RequestParam(name="id",required=true) String id) {
- CalibrationOrderReport calibrationOrderReport = calibrationOrderReportService.getById(id);
- if(calibrationOrderReport==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(calibrationOrderReport);
- }
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param calibrationOrderReport
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param calibrationOrderReport
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "mom_eam_calibration_order_report-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "mom_eam_calibration_order_report-鍒嗛〉鍒楄〃鏌ヨ", notes = "mom_eam_calibration_order_report-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<CalibrationOrderReport>> queryPageList(CalibrationOrderReport calibrationOrderReport, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+ QueryWrapper<CalibrationOrderReport> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrderReport, req.getParameterMap());
+ Page<CalibrationOrderReport> page = new Page<CalibrationOrderReport>(pageNo, pageSize);
+ IPage<CalibrationOrderReport> pageList = calibrationOrderReportService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @return
+ */
+ @PostMapping(value = "/add")
+ @Transactional(rollbackFor = {Exception.class})
+ public Result<?> add(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
+ String str = request.getParameter("data");
+ JSONObject json = JSONObject.parseObject(str);
+
+ boolean isFileChange = true;
+ String uploadId = json.getString("uploadId");
+ String fileType = json.getString("fileType");
+ String description = json.getString("remark");
+ String type = json.getString("type");
+
+ CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class);
+ calibrationOrderReport.setType(fileType);
+ calibrationOrderReportService.save(calibrationOrderReport);
+
+ // 鏂囦欢鍙樻洿
+ if (isFileChange) {
+ if (StrUtils.isNotBlankOrNull(uploadId)) {
+ // 鎯呭舰涓�銆佷粠鏂囦欢绠＄悊涓�夋嫨
+// uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
+ } else {
+ // 鎯呭舰浜屻�侀噸鏂颁笂浼�
+ // 1銆佹寔涔卽pload
+ MultipartFile multipartFile = request.getFile("file");
+ List<MultipartFile> multipartFileList = new ArrayList<>();
+ multipartFileList.add(multipartFile);
+// List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
+// // 2銆佸垱寤�/淇敼 uploadRela
+// // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲�
+// uploadRelaService.saveOrUpdateUploadRale(equipmentDocument.getId(), type, sysUploads.get(0).getId());
+ List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);
+ // 2銆佸垱寤�/淇敼 uploadRela
+ // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲�
+ sysBaseApi.saveOrUpdateUploadRale(calibrationOrderReport.getId(), type, sysUploads.get(0).getId());
+ }
+ }
+ // 鏇存柊涓昏〃涓哄凡瀹屾垚
+ CalibrationOrder calibrationOrder = calibrationOrderService.getById(calibrationOrderReport.getCalibrationOrderId());
+ // status 宸插畬鎴�
+ calibrationOrder.setStatus("4");
+ calibrationOrder.setCalibrationResult(calibrationOrderReport.getJudgmentResult());
+ calibrationOrder.setCalibrationTime(new Date());
+ calibrationOrderService.updateById(calibrationOrder);
+ // 鏇存柊璁惧鎶�鏈姸鎬�
+ Equipment equipment = eamEquipmentService.getById(calibrationOrder.getEquipmentId());
+
+ if (StringUtils.isNotBlank(equipment.getId())) {
+ equipment.setTechnologyStatus(calibrationOrderReport.getJudgmentResult());
+ eamEquipmentService.updateById(equipment);
+ }
+
+ return Result.ok("涓婁紶鎴愬姛!");
+ }
+
+ @PostMapping(value = "/edit")
+ @Transactional(rollbackFor = {Exception.class})
+ public Result<?> edit(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception {
+ String str = request.getParameter("data");
+ JSONObject json = JSONObject.parseObject(str);
+
+ boolean isFileChange = json.getBoolean("isFileChange");
+ String uploadId = json.getString("uploadId");
+ String fileType = json.getString("fileType");
+ String description = json.getString("remark");
+ String type = json.getString("type");
+
+ CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class);
+ calibrationOrderReport.setType(fileType);
+ calibrationOrderReportService.saveOrUpdate(calibrationOrderReport);
+ // 鏂囦欢鍙樻洿
+ if (isFileChange) {
+ if (StrUtils.isNotBlankOrNull(uploadId)) {
+ // 鎯呭舰涓�銆佷粠鏂囦欢绠＄悊涓�夋嫨
+// uploadRelaService.saveOrUpdateUploadRale(partRouteFile.getId(), partRouteFile.getType(), uploadId);
+ } else {
+ // 鎯呭舰浜屻�侀噸鏂颁笂浼�
+ // 1銆佹寔涔卽pload
+ MultipartFile multipartFile = request.getFile("file");
+ List<MultipartFile> multipartFileList = new ArrayList<>();
+ multipartFileList.add(multipartFile);
+// List<SysUpload> sysUploads = uploadService.batchUploadFile(fileType, multipartFileList, description);
+// // 2銆佸垱寤�/淇敼 uploadRela
+// // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲�
+// uploadRelaService.saveOrUpdateUploadRale(equipmentDocument.getId(), type, sysUploads.get(0).getId());
+ List<SysUpload> sysUploads = sysBaseApi.batchUploadFile(fileType, multipartFileList, description);
+ // 2銆佸垱寤�/淇敼 uploadRela
+ // 娉細褰撳墠瑙嗕负鍗曟枃浠朵笂浼犳帶鍒讹紝鍚庣画鍙兘浼氭湁鍗曚釜浜у搧宸ヨ壓鏂囦欢瀵瑰簲澶氫釜涓婁紶鏂囦欢鐨勫崌绾ц皟鏁达紝淇敼鍚庢敞鎰忔洿缁嗘娈垫敞閲�
+ sysBaseApi.saveOrUpdateUploadRale(calibrationOrderReport.getId(), type, sysUploads.get(0).getId());
+ }
+ }
+
+ return Result.ok("涓婁紶鎴愬姛!");
+ }
+
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "mom_eam_calibration_order_report-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "mom_eam_calibration_order_report-閫氳繃id鍒犻櫎", notes = "mom_eam_calibration_order_report-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ //鍒犻櫎鏂囦欢绠＄悊涓庝笟鍔℃暟鎹叧绯�
+// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, id).eq(SysUploadRela::getDelFlag, 0).list();
+ List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType(id, null);
+ for (SysUploadRela sysUploadRela : sysUploadRelas) {
+ String uploadId = sysUploadRela.getUploadId();
+// uploadService.removeById(uploadId);
+// uploadRelaService.removeById(sysUploadRela);
+ sysBaseApi.removeUploadById(uploadId);
+ sysBaseApi.removeUploadRelaById(sysUploadRela.getId());
+ }
+ calibrationOrderReportService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "mom_eam_calibration_order_report-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "mom_eam_calibration_order_report-鎵归噺鍒犻櫎", notes = "mom_eam_calibration_order_report-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.calibrationOrderReportService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "mom_eam_calibration_order_report-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "mom_eam_calibration_order_report-閫氳繃id鏌ヨ", notes = "mom_eam_calibration_order_report-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<CalibrationOrderReport> queryById(@RequestParam(name = "id", required = true) String id) {
+ CalibrationOrderReport calibrationOrderReport = calibrationOrderReportService.getById(id);
+ if (calibrationOrderReport == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(calibrationOrderReport);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param calibrationOrderReport
+ */
//@RequiresPermissions("org.jeecg.modules:mom_eam_calibration_order_report:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CalibrationOrderReport calibrationOrderReport) {
@@ -241,12 +260,12 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("mom_eam_calibration_order_report:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
@@ -254,34 +273,34 @@
}
- /**
- * 璁惧妫�瀹� 鑾峰彇妫�瀹氭姤鍛�
- * qsw 2023-7-20
- */
- @GetMapping("getCalibrationOrderReportList")
- public Result<?> getCalibrationOrderReportList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
- IPage<Map<String, Object>> calibrationOrderReports = calibrationOrderReportService.getCalibrationOrderReportById(pageNo, pageSize, params);
- for (Map<String, Object> calibrationOrderReport : calibrationOrderReports.getRecords()) {
- //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁
+ /**
+ * 璁惧妫�瀹� 鑾峰彇妫�瀹氭姤鍛�
+ * qsw 2023-7-20
+ */
+ @GetMapping("getCalibrationOrderReportList")
+ public Result<?> getCalibrationOrderReportList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> calibrationOrderReports = calibrationOrderReportService.getCalibrationOrderReportById(pageNo, pageSize, params);
+ for (Map<String, Object> calibrationOrderReport : calibrationOrderReports.getRecords()) {
+ //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁
// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) calibrationOrderReport.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
- List<SysUploadRela> sysUploadRelas =sysBaseApi.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), null);
- if (sysUploadRelas.size() > 0) {
+ List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), null);
+ if (sysUploadRelas.size() > 0) {
// List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), "calibration_order_report");
- List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), "calibration_order_report");
- SysUpload upload = new SysUpload();
- if (CollectionUtils.isNotEmpty(uploadRelas)) {
- //upload = uploadService.getById(uploadRelas.get(0).getUploadId());
- upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
- }
- calibrationOrderReport.put("upload", upload);
- } else {
+ List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) calibrationOrderReport.get("id"), "calibration_order_report");
+ SysUpload upload = new SysUpload();
+ if (CollectionUtils.isNotEmpty(uploadRelas)) {
+ //upload = uploadService.getById(uploadRelas.get(0).getUploadId());
+ upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
+ }
+ calibrationOrderReport.put("upload", upload);
+ } else {
- SysUpload upload = new SysUpload();
- calibrationOrderReport.put("upload", upload);
- }
- }
- return Result.ok(calibrationOrderReports);
- }
+ SysUpload upload = new SysUpload();
+ calibrationOrderReport.put("upload", upload);
+ }
+ }
+ return Result.ok(calibrationOrderReports);
+ }
}
--
Gitblit v1.9.3