From d2d083528159fe9291a67f51886f98fe646efd95 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期六, 19 八月 2023 14:32:11 +0800
Subject: [PATCH] 设备管理-更新代码提交 截止 20230819
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesScrapDetail.java | 17
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java | 67 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentUnsealDetail.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentTransferInDetailMapper.xml | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualMaterial.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartScrap.java | 26 -
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionStandardController.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DeteriorationFactor.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentSealServiceImpl.java | 8
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutbound.java | 12
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 8
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderReport.java | 12
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentTransferController.java | 17 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml | 14
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java | 69 +++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java | 8
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocks.java | 14
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorage.java | 14
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 76 ++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCategory.java | 18
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartReceive.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentChangeController.java | 36 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java | 56 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocksDetail.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderRiskPrevention.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java | 7
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentTransferInDetail.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingBorrowDetailMapper.xml | 12
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnloadingController.java | 14
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutboundDetail.java | 24 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorageDetail.java | 28 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParameters.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java | 40 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 6
41 files changed, 358 insertions(+), 304 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index a604a67..7c2294b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -20,15 +20,15 @@
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.entity.CalibrationOrder;
+import org.jeecg.modules.eam.entity.CalibrationOrderDetail;
+import org.jeecg.modules.eam.entity.CalibrationOrderReport;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.service.ICalibrationOrderDetailService;
import org.jeecg.modules.eam.service.ICalibrationOrderReportService;
import org.jeecg.modules.eam.service.ICalibrationOrderService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.CalibrationOrderPage;
-
-//import org.jeecg.modules.system.service.IUploadRelaService;
-//import org.jeecg.modules.system.service.IUploadService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
index 403e04f..6707531 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
@@ -11,8 +11,11 @@
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.*;
-import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.entity.DailyInspectionStandard;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
+import org.jeecg.modules.eam.service.IDailyInspectionStandardDetailService;
+import org.jeecg.modules.eam.service.IDailyInspectionStandardService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentChangeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentChangeController.java
index f5bac9a..2f7c4aa 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentChangeController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentChangeController.java
@@ -1,30 +1,30 @@
package org.jeecg.modules.eam.controller;
-import java.text.ParseException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.jeecg.modules.eam.entity.*;
+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.query.QueryGenerator;
+import org.jeecg.modules.eam.entity.Equipment;
+import org.jeecg.modules.eam.entity.EquipmentChange;
+import org.jeecg.modules.eam.entity.EquipmentChangeDetail;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEquipmentChangeDetailService;
import org.jeecg.modules.eam.service.IEquipmentChangeService;
import org.jeecg.modules.eam.service.IEquipmentScrapDetailService;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-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 io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 璁惧鍙樺姩
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java
index 7a08329..52707d0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java
@@ -1,45 +1,44 @@
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.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.EquipmentDisposal;
+import org.jeecg.modules.eam.entity.EquipmentDisposalDetail;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.IEquipmentDisposalDetailService;
+import org.jeecg.modules.eam.service.IEquipmentDisposalService;
+import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
+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.BeanUtils;
+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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-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;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.vo.LoginUser;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EquipmentDisposalDetail;
-import org.jeecg.modules.eam.entity.EquipmentDisposal;
-import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
-import org.jeecg.modules.eam.service.IEquipmentDisposalService;
-import org.jeecg.modules.eam.service.IEquipmentDisposalDetailService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-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 io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 璁惧澶勭疆
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
index 91b6300..5b19064 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -12,9 +12,11 @@
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.eam.entity.*;
-import org.jeecg.modules.eam.service.IEquipmentReportRepairService;
+import org.jeecg.modules.eam.entity.Equipment;
+import org.jeecg.modules.eam.entity.EquipmentReportRepair;
+import org.jeecg.modules.eam.entity.FaultDescription;
import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.IEquipmentReportRepairService;
import org.jeecg.modules.eam.service.IFaultDescriptionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentTransferController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentTransferController.java
index e1902ba..c801d24 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentTransferController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentTransferController.java
@@ -15,10 +15,14 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
-
-import org.jeecg.modules.eam.entity.*;
-import org.jeecg.modules.eam.service.*;
-
+import org.jeecg.modules.eam.entity.Equipment;
+import org.jeecg.modules.eam.entity.EquipmentTransfer;
+import org.jeecg.modules.eam.entity.EquipmentTransferInDetail;
+import org.jeecg.modules.eam.entity.EquipmentTransferOutDetail;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.IEquipmentTransferInDetailService;
+import org.jeecg.modules.eam.service.IEquipmentTransferOutDetailService;
+import org.jeecg.modules.eam.service.IEquipmentTransferService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -31,7 +35,10 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @Description: mom_eam_inspection_project
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnloadingController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnloadingController.java
index 66015c0..c4c0424 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnloadingController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnloadingController.java
@@ -11,8 +11,14 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.eam.entity.*;
-import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.entity.Equipment;
+import org.jeecg.modules.eam.entity.EquipmentUnloading;
+import org.jeecg.modules.eam.entity.EquipmentUnloadingBorrowDetail;
+import org.jeecg.modules.eam.entity.EquipmentUnloadingReturnDetail;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.IEquipmentUnloadingBorrowDetailService;
+import org.jeecg.modules.eam.service.IEquipmentUnloadingReturnDetailService;
+import org.jeecg.modules.eam.service.IEquipmentUnloadingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -25,7 +31,9 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* @Description: mom_eam_inspection_project
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
index 56cf6c9..312686b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
@@ -1,49 +1,44 @@
package org.jeecg.modules.eam.controller;
-import java.io.UnsupportedEncodingException;
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+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.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.eam.entity.EquipmentSeal;
-import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.Equipment;
+import org.jeecg.modules.eam.entity.EquipmentUnseal;
+import org.jeecg.modules.eam.entity.EquipmentUnsealDetail;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.IEquipmentUnsealDetailService;
+import org.jeecg.modules.eam.service.IEquipmentUnsealService;
+import org.jeecg.modules.eam.vo.EquipmentUnsealPage;
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.jeecg.common.system.vo.LoginUser;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EquipmentUnsealDetail;
-import org.jeecg.modules.eam.entity.EquipmentUnseal;
-import org.jeecg.modules.eam.vo.EquipmentUnsealPage;
-import org.jeecg.modules.eam.service.IEquipmentUnsealService;
-import org.jeecg.modules.eam.service.IEquipmentUnsealDetailService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
-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 com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 璁惧鍚皝
@@ -60,6 +55,9 @@
private IEquipmentUnsealService equipmentUnsealService;
@Autowired
private IEquipmentUnsealDetailService equipmentUnsealDetailService;
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -292,6 +290,11 @@
QueryWrapper<EquipmentUnsealDetail> queryWrapper = QueryGenerator.initQueryWrapper(equipmentUnsealDetail, req.getParameterMap());
Page<EquipmentUnsealDetail> page = new Page<EquipmentUnsealDetail>(pageNo, pageSize);
IPage<EquipmentUnsealDetail> pageList = equipmentUnsealDetailService.page(page, queryWrapper);
+ for (EquipmentUnsealDetail record : pageList.getRecords()) {
+ String equipmentId = record.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ record.setEquipmentPhoto(equipment.getEquipmentPhoto());
+ }
return Result.OK(pageList);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
index 7ec9cca..ca17c5a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -17,10 +17,6 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
-//import org.jeecg.modules.system.entity.SysUpload;
-//import org.jeecg.modules.system.entity.SysUploadRela;
-//import org.jeecg.modules.system.service.IUploadRelaService;
-//import org.jeecg.modules.system.service.IUploadService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
index c4a5d40..3f80c10 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
@@ -1,42 +1,41 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.eam.entity.*;
-import org.jeecg.modules.eam.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-import org.jeecg.common.util.oConvertUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.service.*;
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.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Transactional;
+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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -280,7 +279,21 @@
//@RequiresPermissions("org.jeecg.modules.demo:mom_eam_repair_order:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- repairOrderService.update(new UpdateWrapper<RepairOrder>().set("del_flag", CommonConstant.DEL_FLAG_1).eq("id",id));
+ /**
+ * 鏍规嵁涓氬姟绫诲瀷鑾峰彇缁翠慨宸ュ崟鐨勬潵婧� 鍒犻櫎宸ュ崟鏃舵仮澶嶆潵婧愮姸鎬�
+ * 2023-8-17
+ */
+ RepairOrder repairOrder = repairOrderService.getById(id);
+ String businessType = repairOrder.getBusinessType();
+ if("2".equals(businessType)){//1:鎶ヤ慨鏁呴殰鍗� 2锛氶」鐩�х淮淇�
+ String projectMaintenanceOrderDetailId = repairOrder.getProjectMaintenanceOrderId();
+ projectMaintenanceOrderDetailService.update(new UpdateWrapper<ProjectMaintenanceOrderDetail>().set("is_create_order",0).eq("id",projectMaintenanceOrderDetailId));
+ }else if("1".equals(businessType)){
+ String reportRepairId = repairOrder.getReportRepairId();
+ equipmentReportRepairService.update(new UpdateWrapper<EquipmentReportRepair>().set("is_create_order",0).eq("id",reportRepairId));
+ }
+
+ repairOrderService.update(new UpdateWrapper<RepairOrder>().set("del_flag", CommonConstant.DEL_FLAG_1).eq("id",id));
return Result.OK("鍒犻櫎鎴愬姛!");
}
@@ -1475,9 +1488,18 @@
//鍒ゆ柇椤圭洰鎬х淮淇瓙琛ㄧ姸鎬�
ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder.getProjectMaintenanceOrderId());
projectMaintenanceOrderDetail.setTypeStatus("underExecution");
+ projectMaintenanceOrderDetail.setActualStartTime(new Date());
projectMaintenanceOrderDetailService.updateById(projectMaintenanceOrderDetail);
//鍒ゆ柇椤圭洰鎬х淮淇富琛ㄧ姸鎬�
ProjectMaintenanceOrder projectMaintenanceOrder = projectMaintenanceOrderService.getById(projectMaintenanceOrderDetail.getProjectMaintenanceOrderId());
+ /**
+ * 椤圭洰椤圭淮淇富琛ㄧ淮鎶ら娆″紑濮嬫椂闂达紝
+ * 閫昏緫锛氬鏋滄槸null锛屾槑缁嗙敓鎴愮殑缁翠慨宸ュ崟寮�宸ユ椂锛岀淮鎶ゅ疄闄呭紑濮嬫椂闂达紝
+ */
+ Date actualStartTime = projectMaintenanceOrder.getActualStartTime();
+ if(actualStartTime == null){
+ projectMaintenanceOrder.setActualStartTime(new Date());
+ }
projectMaintenanceOrder.setTypeStatus("underExecution");
projectMaintenanceOrderService.updateById(projectMaintenanceOrder);
}
@@ -1494,10 +1516,13 @@
//鍒ゆ柇椤圭洰鎬х淮淇瓙琛ㄧ姸鎬�
ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder.getProjectMaintenanceOrderId());
projectMaintenanceOrderDetail.setTypeStatus("completed");
+ projectMaintenanceOrderDetail.setActualEndTime(new Date());
projectMaintenanceOrderDetailService.updateById(projectMaintenanceOrderDetail);
//鍒ゆ柇椤圭洰鎬х淮淇富琛ㄧ姸鎬�
- List<ProjectMaintenanceOrderDetail> projectMaintenanceOrderDetailList = projectMaintenanceOrderDetailService.lambdaQuery().eq(ProjectMaintenanceOrderDetail::getProjectMaintenanceOrderId,projectMaintenanceOrderDetail.getProjectMaintenanceOrderId())
- .eq(ProjectMaintenanceOrderDetail::getDelFlag,CommonConstant.DEL_FLAG_0).list();
+ List<ProjectMaintenanceOrderDetail> projectMaintenanceOrderDetailList = projectMaintenanceOrderDetailService.lambdaQuery()
+ .eq(ProjectMaintenanceOrderDetail::getProjectMaintenanceOrderId,projectMaintenanceOrderDetail.getProjectMaintenanceOrderId())
+ .eq(ProjectMaintenanceOrderDetail::getDelFlag,CommonConstant.DEL_FLAG_0)
+ .list();
ProjectMaintenanceOrder projectMaintenanceOrder = projectMaintenanceOrderService.getById(projectMaintenanceOrderDetail.getProjectMaintenanceOrderId());
boolean flag = true;
for(ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail1 : projectMaintenanceOrderDetailList){
@@ -1508,6 +1533,7 @@
}
}
if(flag){
+ projectMaintenanceOrder.setActualEndTime(new Date());
projectMaintenanceOrder.setTypeStatus("completed");
}else {
projectMaintenanceOrder.setTypeStatus("underExecution");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionStandardController.java
index 75e8f21..ae9b2d8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/SpecialtyInspectionStandardController.java
@@ -13,7 +13,9 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.SpecialtyInspectionStandard;
import org.jeecg.modules.eam.entity.SpecialtyInspectionStandardDetail;
-import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.ISpecialtyInspectionStandardDetailService;
+import org.jeecg.modules.eam.service.ISpecialtyInspectionStandardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java
index 2636073..b961f83 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java
@@ -68,13 +68,13 @@
*/
@Excel(name = "妫�瀹氭椂闂�", width = 15)
@ApiModelProperty(value = "妫�瀹氭椂闂�")
- private Date calibrationTime;
+ private java.util.Date calibrationTime;
/**
* 涓嬪彂鏃堕棿
*/
@Excel(name = "涓嬪彂鏃堕棿", width = 15)
@ApiModelProperty(value = "涓嬪彂鏃堕棿")
- private Date issueTime;
+ private java.util.Date issueTime;
/**
* 妫�瀹氱粨鏋�
*/
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderReport.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderReport.java
index 3d9208e..d3f2594 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderReport.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderReport.java
@@ -36,24 +36,24 @@
/**妫�瀹氬伐鍗昳d*/
@Excel(name = "妫�瀹氬伐鍗昳d", width = 15)
@ApiModelProperty(value = "妫�瀹氬伐鍗昳d")
- private String calibrationOrderId;
+ private java.lang.String calibrationOrderId;
/**鎶ュ憡缂栧彿*/
@Excel(name = "鎶ュ憡缂栧彿", width = 15)
@ApiModelProperty(value = "鎶ュ憡缂栧彿")
- private String num;
+ private java.lang.String num;
/**鎶ュ憡绫诲瀷 锛堝瓧鍏竎ommon_upload_type锛�*/
@Excel(name = "鎶ュ憡绫诲瀷 锛堝瓧鍏竎ommon_upload_type锛�", width = 15)
@ApiModelProperty(value = "鎶ュ憡绫诲瀷 锛堝瓧鍏竎ommon_upload_type锛�")
@Dict(dicCode = "瀛楀吀common_upload_type")
- private String type;
+ private java.lang.String type;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private java.lang.String remark;
/**鐘舵�� 0 绂佺敤 1 鍚敤*/
@Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
@ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status;
+ private java.lang.String status;
@ApiModelProperty(value = "鍒ゅ畾缁撴灉锛坧ass锛� 姝ｅ父 锛宖ail锛氬紓甯革級")
@Dict(dicCode = "judgment_result")
@@ -61,5 +61,5 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DeteriorationFactor.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DeteriorationFactor.java
index 3fd6c01..33a0664 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DeteriorationFactor.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DeteriorationFactor.java
@@ -49,7 +49,7 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java
index 302dec0..6c3d7ce 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentSpares.java
@@ -33,13 +33,13 @@
private String sparePartId;
@ApiModelProperty(value = "閰嶅鏁伴噺")
- private Double matingQuantity;
+ private java.lang.Double matingQuantity;
@ApiModelProperty(value = "棰濆畾瀵垮懡")
- private Double lifeSpan;
+ private java.lang.Double lifeSpan;
@ApiModelProperty(value = "鎺у埗鏇存崲鍛ㄦ湡")
- private Double changeCycle;
+ private java.lang.Double changeCycle;
@ApiModelProperty(value = "鏇存崲鍛ㄦ湡鍗曚綅")
private String unitId;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentTransferInDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentTransferInDetail.java
index adade7b..01877d1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentTransferInDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentTransferInDetail.java
@@ -136,6 +136,7 @@
*/
@Excel(name = "璋冨叆璐ｄ换鐝粍", width = 15)
@ApiModelProperty(value = "璋冨叆璐ｄ换鐝粍")
+ @Dict(dicCode = "id",dicText = "name",dictTable = "mom_base_team")
private String responsibilityTeamId;
/**
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentUnsealDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentUnsealDetail.java
index f6226b8..2f55fa5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentUnsealDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentUnsealDetail.java
@@ -2,6 +2,7 @@
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -137,4 +138,7 @@
@Excel(name = "澶囩敤瀛楁5", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁5")
private String equipmentUnsealDetailUda5;
+
+ @TableField(exist = false)
+ private String equipmentPhoto;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParameters.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParameters.java
index 820df2d..b0dc200 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParameters.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParameters.java
@@ -52,7 +52,7 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualMaterial.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualMaterial.java
index 18de893..dfdcb4e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualMaterial.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualMaterial.java
@@ -56,7 +56,7 @@
/**瀹為檯鐢ㄦ枡鏁伴噺*/
@Excel(name = "瀹為檯鐢ㄦ枡鏁伴噺", width = 15)
@ApiModelProperty(value = "瀹為檯鐢ㄦ枡鏁伴噺")
- private BigDecimal actualQuantity;
+ private java.math.BigDecimal actualQuantity;
/**鍒涘缓浜�*/
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java
index 7fac8db..c9ede15 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderActualWorkHours.java
@@ -61,7 +61,7 @@
*/
@ApiModelProperty(value = "鍒涘缓浜�")
@Excel(name = "鍒涘缓浜�", width = 15)
- private String createBy;
+ private java.lang.String createBy;
/**
* 鍒涘缓鏃堕棿
@@ -70,14 +70,14 @@
@Excel(name = "鍒涘缓鏃堕棿", width = 20, 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")
- private Date createTime;
+ private java.util.Date createTime;
/**
* 鏇存柊浜�
*/
@ApiModelProperty(value = "鏇存柊浜�")
@Excel(name = "鏇存柊浜�", width = 15)
- private String updateBy;
+ private java.lang.String updateBy;
/**
* 鏇存柊鏃堕棿
@@ -86,7 +86,7 @@
@Excel(name = "鏇存柊鏃堕棿", width = 20, 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")
- private Date updateTime;
+ private java.util.Date updateTime;
/**绉熸埛id*/
@Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderRiskPrevention.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderRiskPrevention.java
index 0f0267f..1e50a55 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderRiskPrevention.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderRiskPrevention.java
@@ -49,7 +49,7 @@
@Excel(name = "鍒涘缓鏃堕棿", width = 20, 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")
- private Date createTime;
+ private java.util.Date createTime;
/**淇敼浜�*/
@ApiModelProperty(value = "淇敼浜�")
private String updateBy;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java
index f7325dc..4f91587 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java
@@ -56,7 +56,7 @@
@Excel(name = "鏁呴殰鏃堕棿", width = 20, 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")
- private Date faultTime;
+ private java.util.Date faultTime;
/**鏄惁鍋滄満寰呬慨*/
@Excel(name = "鏄惁鍋滄満寰呬慨", width = 15)
@ApiModelProperty(value = "鏄惁鍋滄満寰呬慨")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentTransferInDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentTransferInDetailMapper.xml
index c34be6b..61e2d1e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentTransferInDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentTransferInDetailMapper.xml
@@ -62,13 +62,12 @@
t1.responsibility_user_id as responsibilityUserId,
t1.use_depart_id as useDepartId,
t1.responsibility_team_id as responsibilityTeamId,
+ t8.name responsibilityTeamName,
t1.demand_date as demandDate,
t1.actual_in_date as actualInDate,
t1.in_depart_id as inDepartId,
t1.in_manager_id as inManagerId,
t1.use_depart_id as useDepartId,
- t1.responsibility_team_id as responsibilityTeamId,
- t1.responsibility_user_id as responsibilityUserId,
t1.position as position,
t1.equipment_id as equipmentId,
t1.technical_status as technicalStatus,
@@ -96,6 +95,7 @@
LEFT JOIN sys_depart t6 ON t1.use_depart_id = t6.id
LEFT JOIN sys_user t7 ON t1.responsibility_user_id = t7.id
LEFT JOIN mom_eam_transfer_method t5 ON t1.transfer_method_id = t5.id
+ LEFT JOIN mom_base_team t8 on t1.responsibility_team_id = t8.id
WHERE t1.del_flag = 0
<if test="params.equipmentTransferId != null and params.equipmentTransferId != ''">
and t1.equipment_transfer_id = #{params.equipmentTransferId}
@@ -103,4 +103,4 @@
ORDER BY t1.create_time desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingBorrowDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingBorrowDetailMapper.xml
index 0c1d568..3084848 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingBorrowDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingBorrowDetailMapper.xml
@@ -19,12 +19,16 @@
t1.technical_status as technicalStatus,
t2.specification as specification,
t1.update_by as updateBy,
- t1.update_time as updateTime
+ t1.update_time as updateTime,
+ t4.name as responsibilityTeamName,
+ t3.realname as responsibilityUserName
FROM
mom_eam_equipment_unloading_borrow_detail t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN sys_user t3 ON t1.responsibility_user_id = t3.id
+ LEFT JOIN mom_base_team t4 ON t1.responsibility_team_id = t4.id
<if test="equipmentUnloadingId != null and equipmentUnloadingId != ''">
WHERE t1.del_flag = 0 and t1.equipment_unloading_id = #{equipmentUnloadingId}
</if>
@@ -39,8 +43,6 @@
t1.responsibility_user_id as responsibilityUserId,
t1.responsibility_team_id as responsibilityTeamId,
t1.actual_borrow_date as actualBorrowDate,
- t1.responsibility_team_id as responsibilityTeamId,
- t1.responsibility_user_id as responsibilityUserId,
t1.equipment_id as equipmentId,
t1.technical_status as technicalStatus,
t2.num as equipmentNum,
@@ -52,11 +54,13 @@
t1.update_time as updateTime,
t3.id AS responsibilityUserId,
t3.realname as responsibilityUserName,
- t4.item_text as equipmentStatusName
+ t4.item_text as equipmentStatusName,
+ t5.name as responsibilityTeamName
FROM
mom_eam_equipment_unloading_borrow_detail t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
LEFT JOIN sys_user t3 ON t1.responsibility_user_id = t3.id
+ LEFT JOIN mom_base_team t5 ON t1.responsibility_team_id = t5.id
left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'equipment_status' ) t4 on t4.item_value = t2.equipment_status
WHERE t1.del_flag = 0
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml
index 760549a..10bd964 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentUnloadingReturnDetailMapper.xml
@@ -19,12 +19,15 @@
t1.technical_status as technicalStatus,
t2.specification as specification,
t1.update_by as updateBy,
- t1.update_time as updateTime
-
+ t1.update_time as updateTime,
+ t4.name as responsibilityTeamName,
+ t3.realname as responsibilityUserName
FROM
mom_eam_equipment_unloading_return_detail t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN sys_user t3 ON t1.responsibility_user_id = t3.id
+ LEFT JOIN mom_base_team t4 ON t1.responsibility_team_id = t4.id
<if test="equipmentUnloadingId != null and equipmentUnloadingId != ''">
WHERE t1.del_flag = 0 and t1.equipment_unloading_id = #{equipmentUnloadingId}
</if>
@@ -40,8 +43,6 @@
t1.responsibility_team_id as responsibilityTeamId,
t1.actual_return_date as actualReturnDate,
t1.actual_borrow_date as actualBorrowDate,
- t1.responsibility_team_id as responsibilityTeamId,
- t1.responsibility_user_id as responsibilityUserId,
t1.equipment_id as equipmentId,
t1.technical_status as technicalStatus,
t2.num as equipmentNum,
@@ -51,12 +52,13 @@
t1.update_by as updateBy,
t1.update_time as updateTime,
t3.id AS responsibilityUserId,
- t3.realname as responsibilityUserName
+ t3.realname as responsibilityUserName,
+ t5.name as responsibilityTeamName
FROM
mom_eam_equipment_unloading_return_detail t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
LEFT JOIN sys_user t3 ON t1.responsibility_user_id = t3.id
-
+ LEFT JOIN mom_base_team t5 ON t1.responsibility_team_id = t5.id
WHERE t1.del_flag = 0
<if test="params.equipmentUnloadingId != null and params.equipmentUnloadingId != ''">
and t1.equipment_unloading_id = #{params.equipmentUnloadingId}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentSealServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentSealServiceImpl.java
index 30d2f57..522d95c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentSealServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentSealServiceImpl.java
@@ -1,20 +1,20 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.EquipmentSeal;
import org.jeecg.modules.eam.entity.EquipmentSealDetail;
import org.jeecg.modules.eam.mapper.EquipmentSealDetailMapper;
import org.jeecg.modules.eam.mapper.EquipmentSealMapper;
-import org.jeecg.modules.eam.service.IEquipmentSealService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.IEquipmentSealService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
-import java.util.List;
import java.util.Collection;
+import java.util.List;
/**
* @Description: 璁惧灏佸瓨
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java
index 9019a9a..9463469 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java
@@ -37,90 +37,90 @@
/**澶囦欢鍒嗙被id*/
@Excel(name = "澶囦欢鍒嗙被id", width = 15)
@ApiModelProperty(value = "澶囦欢鍒嗙被id")
- private String sparePartCategoryId;
+ private java.lang.String sparePartCategoryId;
/**澶囦欢缂栫爜*/
@Excel(name = "澶囦欢缂栫爜", width = 15)
@ApiModelProperty(value = "澶囦欢缂栫爜")
- private String num;
+ private java.lang.String num;
/**澶囦欢鍚嶇О*/
@Excel(name = "澶囦欢鍚嶇О", width = 15)
@ApiModelProperty(value = "澶囦欢鍚嶇О")
- private String name;
+ private java.lang.String name;
/**鐘舵�� 0 绂佺敤 1 鍚敤*/
@Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
@ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status = CommonConstant.STATUS_1;
+ private java.lang.String status = CommonConstant.STATUS_1;
/**鍨嬪彿*/
@Excel(name = "鍨嬪彿", width = 15)
@ApiModelProperty(value = "鍨嬪彿")
- private String model;
+ private java.lang.String model;
/**瑙勫垯*/
@Excel(name = "瑙勫垯", width = 15)
@ApiModelProperty(value = "瑙勫垯")
- private String specification;
+ private java.lang.String specification;
/**鍒堕�犲晢*/
@Excel(name = "鍒堕�犲晢", width = 15)
@ApiModelProperty(value = "鍒堕�犲晢")
@Dict(dicCode = "id",dictTable="mom_base_constructor",dicText="name")
- private String constructorId;
+ private java.lang.String constructorId;
/**涓诲崟浣峣d*/
@Excel(name = "涓诲崟浣峣d", width = 15)
@ApiModelProperty(value = "涓诲崟浣峣d")
@Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
- private String mainUnitId;
+ private java.lang.String mainUnitId;
/**杈呭崟浣峣d*/
@Excel(name = "杈呭崟浣峣d", width = 15)
@ApiModelProperty(value = "杈呭崟浣峣d")
@Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
- private String auxiliaryUnitId;
+ private java.lang.String auxiliaryUnitId;
/**鎹㈢畻姣斾緥*/
@Excel(name = "鎹㈢畻姣斾緥", width = 15)
@ApiModelProperty(value = "鎹㈢畻姣斾緥")
- private String conversionRatio;
+ private java.lang.String conversionRatio;
/**鎵规绠＄悊鏍囪瘑*/
@Excel(name = "鎵规绠＄悊鏍囪瘑", width = 15)
@ApiModelProperty(value = "鎵规绠＄悊鏍囪瘑")
- private Integer batchManagedFlag;
+ private java.lang.Integer batchManagedFlag;
/**鏈夋晥鏈熺鐞嗘爣璇�*/
@Excel(name = "鏈夋晥鏈熺鐞嗘爣璇�", width = 15)
@ApiModelProperty(value = "鏈夋晥鏈熺鐞嗘爣璇�")
- private Integer validityManagedFlag;
+ private java.lang.Integer validityManagedFlag;
/**鏈夋晥鏈�*/
@Excel(name = "鏈夋晥鏈�", width = 15)
@ApiModelProperty(value = "鏈夋晥鏈�")
- private Integer validityPeriod;
+ private java.lang.Integer validityPeriod;
/**鏈夋晥鏈熷崟浣�*/
@Excel(name = "鏈夋晥鏈熷崟浣�", width = 15)
@ApiModelProperty(value = "鏈夋晥鏈熷崟浣�")
@Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
- private String validityPeriodUnitId;
+ private java.lang.String validityPeriodUnitId;
/**搴撳瓨涓婇檺鍒�*/
@Excel(name = "搴撳瓨涓婇檺鍒�", width = 15)
@ApiModelProperty(value = "搴撳瓨涓婇檺鍒�")
- private Integer inventoryUpperLimit;
+ private java.lang.Integer inventoryUpperLimit;
/**搴撳瓨涓嬮檺鍒�*/
@Excel(name = "搴撳瓨涓嬮檺鍒�", width = 15)
@ApiModelProperty(value = "搴撳瓨涓嬮檺鍒�")
- private Integer inventoryLowerLimit;
+ private java.lang.Integer inventoryLowerLimit;
/**搴撳瓨棰勮涓嬮檺*/
@Excel(name = "搴撳瓨棰勮涓嬮檺", width = 15)
@ApiModelProperty(value = "搴撳瓨棰勮涓嬮檺")
- private Integer inventoryWarnLimit;
+ private java.lang.Integer inventoryWarnLimit;
/**缁忔祹璁㈣揣閲�*/
@Excel(name = "缁忔祹璁㈣揣閲�", width = 15)
@ApiModelProperty(value = "缁忔祹璁㈣揣閲�")
- private Integer economicOrderQuantity;
+ private java.lang.Integer economicOrderQuantity;
/**閲囪喘鎻愬墠鏈�*/
@Excel(name = "閲囪喘鎻愬墠鏈�", width = 15)
@ApiModelProperty(value = "閲囪喘鎻愬墠鏈�")
- private Integer purchaseLeadTime;
+ private java.lang.Integer purchaseLeadTime;
/**绉熸埛id*/
@Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
+ private java.lang.String tenantId;
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
@@ -129,34 +129,34 @@
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private java.lang.String remark;
/**澶囩敤瀛楁1*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁1")
- private String uda1;
+ private java.lang.String uda1;
/**澶囩敤瀛楁2*/
@Excel(name = "澶囩敤瀛楁2", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁2")
- private String uda2;
+ private java.lang.String uda2;
/**澶囩敤瀛楁3*/
@Excel(name = "澶囩敤瀛楁3", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁3")
- private String uda3;
+ private java.lang.String uda3;
/**澶囩敤瀛楁4*/
@Excel(name = "澶囩敤瀛楁4", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁4")
- private String uda4;
+ private java.lang.String uda4;
/**澶囩敤瀛楁5*/
@Excel(name = "澶囩敤瀛楁5", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁5")
- private String uda5;
+ private java.lang.String uda5;
@TableField(exist = false)
private List<AuxiliaryUnitVo> auxiliaryUnits;
@TableField(exist = false)
- private Double totalMainQuantity;
+ private java.lang.Double totalMainQuantity;
@TableField(exist = false)
- private Double totalAuxiliaryQuantity;
+ private java.lang.Double totalAuxiliaryQuantity;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocks.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocks.java
index b95c422..94d8927 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocks.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocks.java
@@ -46,49 +46,49 @@
@Excel(name = "鐘舵�侊紙0宸插垱寤猴紝1宸叉彁浜わ紝2宸查�氳繃锛�3宸查┏鍥�,4宸插畬鎴愶級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙0宸插垱寤猴紝1宸叉彁浜わ紝2宸查�氳繃锛�3宸查┏鍥�,4宸插畬鎴愶級")
@Dict(dicCode = "purchase_storage_status")
- private String status;
+ private java.lang.String status;
/**
* 浠撳簱id
*/
@Excel(name = "浠撳簱id", width = 15)
@ApiModelProperty(value = "浠撳簱id")
@Dict(dictTable = "mom_base_warehouse", dicText = "name", dicCode = "id")
- private String warehouseId;
+ private java.lang.String warehouseId;
/**
* 棰嗙敤閮ㄩ棬ID
*/
@Excel(name = "棰嗙敤閮ㄩ棬ID", width = 15)
@ApiModelProperty(value = "棰嗙敤閮ㄩ棬ID")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
- private String departId;
+ private java.lang.String departId;
/**
* 棰嗙敤浜篿d
*/
@Excel(name = "棰嗙敤浜篿d", width = 15)
@ApiModelProperty(value = "棰嗙敤浜篿d")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
- private String userId;
+ private java.lang.String userId;
/**
* 鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)
*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 澶囨敞
*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private java.lang.String remark;
/**
* 瀹℃壒鎰忚
*/
@Excel(name = "瀹℃壒鎰忚", width = 15)
@ApiModelProperty(value = "瀹℃壒鎰忚")
- private String approvalOpinions;
+ private java.lang.String approvalOpinions;
@TableField(exist = false)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocksDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocksDetail.java
index 2f38005..faece10 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocksDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCancellingStocksDetail.java
@@ -104,7 +104,7 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 搴撲綅
@@ -125,7 +125,7 @@
/**鐘舵�侊紙0鏈嚭搴擄紝1宸插嚭搴擄級*/
@Excel(name = "鐘舵�侊紙0鏈嚭搴擄紝1宸插嚭搴擄級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙0鏈嚭搴擄紝1宸插嚭搴擄級")
- private String status;
+ private java.lang.String status;
/**
* 鍑哄簱鏁伴噺
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCategory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCategory.java
index ed54a12..97651d6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCategory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartCategory.java
@@ -37,35 +37,35 @@
/**澶囦欢鍒嗙被缂栫爜*/
@Excel(name = "澶囦欢鍒嗙被缂栫爜", width = 15)
@ApiModelProperty(value = "澶囦欢鍒嗙被缂栫爜")
- private String code;
+ private java.lang.String code;
/**澶囦欢鍒嗙被鍚嶇О*/
@Excel(name = "澶囦欢鍒嗙被鍚嶇О", width = 15)
@ApiModelProperty(value = "澶囦欢鍒嗙被鍚嶇О")
- private String name;
+ private java.lang.String name;
/**涓婄骇鍒嗙被*/
@Excel(name = "涓婄骇鍒嗙被", width = 15)
@ApiModelProperty(value = "涓婄骇鍒嗙被")
- private String parentId;
+ private java.lang.String parentId;
/**澶囩敤瀛楁1*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁1")
- private String uda1;
+ private java.lang.String uda1;
/**澶囩敤瀛楁2*/
@Excel(name = "澶囩敤瀛楁2", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁2")
- private String uda2;
+ private java.lang.String uda2;
/**澶囩敤瀛楁3*/
@Excel(name = "澶囩敤瀛楁3", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁3")
- private String uda3;
+ private java.lang.String uda3;
/**澶囩敤瀛楁4*/
@Excel(name = "澶囩敤瀛楁4", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁4")
- private String uda4;
+ private java.lang.String uda4;
/**澶囩敤瀛楁5*/
@Excel(name = "澶囩敤瀛楁5", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁5")
- private String uda5;
+ private java.lang.String uda5;
/**鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�*/
@Excel(name = "鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�", width = 15)
@ApiModelProperty(value = "鐘舵�侊紝0锛氭甯革紝1锛氬垹闄�")
@@ -74,5 +74,5 @@
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private java.lang.String remark;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutbound.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutbound.java
index 0104a68..9b37bd8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutbound.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutbound.java
@@ -32,7 +32,7 @@
/**鐢宠鍗曠紪鐮�*/
@Excel(name = "鐢宠鍗曠紪鐮�", width = 15)
@ApiModelProperty(value = "鐢宠鍗曠紪鐮�")
- private String num;
+ private java.lang.String num;
/**浠撳簱id*/
@Dict(dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
@@ -41,26 +41,26 @@
@Excel(name = "鍑哄簱浜哄憳id", width = 15)
@ApiModelProperty(value = "鍑哄簱浜哄憳id")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
- private String outboundPersonId;
+ private java.lang.String outboundPersonId;
/**鍑哄簱閮ㄩ棬ID*/
@Excel(name = "鍑哄簱閮ㄩ棬ID", width = 15)
@ApiModelProperty(value = "鍑哄簱閮ㄩ棬ID")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
- private String departId;
+ private java.lang.String departId;
/**鍑哄簱绫诲瀷*/
@Excel(name = "鍑哄簱绫诲瀷", width = 15)
@ApiModelProperty(value = "鍑哄簱绫诲瀷")
- private String type;
+ private java.lang.String type;
/**鐘舵�侊紙0宸插垱寤猴紝1宸叉彁浜わ紝2宸查�氳繃锛�3宸查┏鍥�,4宸插畬鎴愶級*/
@Excel(name = "鐘舵�侊紙0宸插垱寤猴紝1宸叉彁浜わ紝2宸查�氳繃锛�3宸查┏鍥�,4宸插畬鎴愶級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙0宸插垱寤猴紝1宸叉彁浜わ紝2宸查�氳繃锛�3宸查┏鍥�,4宸插畬鎴愶級")
@Dict(dicCode = "purchase_storage_status")
- private String status;
+ private java.lang.String status;
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
@Excel(name = "瀹℃壒鎰忚", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutboundDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutboundDetail.java
index a2ce803..57efa17 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutboundDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartOutboundDetail.java
@@ -32,31 +32,31 @@
/**鍑哄簱鐢宠鍗昳d*/
@Excel(name = "鍑哄簱鐢宠鍗昳d", width = 15)
@ApiModelProperty(value = "鍑哄簱鐢宠鍗昳d")
- private String sparePartOutboundId;
+ private java.lang.String sparePartOutboundId;
/**澶囦欢id*/
@Excel(name = "澶囦欢id", width = 15)
@ApiModelProperty(value = "澶囦欢id")
- private String sparePartId;
+ private java.lang.String sparePartId;
/**搴撳瓨id*/
@Excel(name = "搴撳瓨id", width = 15)
@ApiModelProperty(value = "搴撳瓨id")
- private String sparesPartInventoryId;
+ private java.lang.String sparesPartInventoryId;
/**涓诲崟浣�*/
@Excel(name = "涓诲崟浣�", width = 15)
@ApiModelProperty(value = "涓诲崟浣�")
- private String mainUnitId;
+ private java.lang.String mainUnitId;
/**鍑哄簱涓绘暟閲�*/
@Excel(name = "鍑哄簱涓绘暟閲�", width = 15)
@ApiModelProperty(value = "鍑哄簱涓绘暟閲�")
- private Double outboundMainQuantity;
+ private java.lang.Double outboundMainQuantity;
/**杈呭崟浣�*/
@Excel(name = "杈呭崟浣�", width = 15)
@ApiModelProperty(value = "杈呭崟浣�")
- private String auxiliaryUnitId;
+ private java.lang.String auxiliaryUnitId;
/**鍑哄簱杈呮暟閲�*/
@Excel(name = "鍑哄簱杈呮暟閲�", width = 15)
@ApiModelProperty(value = "鍑哄簱杈呮暟閲�")
- private Double outboundAuxiliaryQuantity;
+ private java.lang.Double outboundAuxiliaryQuantity;
/**宸叉秷鑰楁暟閲�*/
@Excel(name = "宸叉秷鑰楁暟閲�", width = 15)
@ApiModelProperty(value = "宸叉秷鑰楁暟閲�")
@@ -64,11 +64,11 @@
/**鐘舵�侊紙0鏈嚭搴擄紝1宸插嚭搴擄級*/
@Excel(name = "鐘舵�侊紙0鏈嚭搴擄紝1宸插嚭搴擄級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙0鏈嚭搴擄紝1宸插嚭搴擄級")
- private String status;
+ private java.lang.String status;
/**鎵规鍙�*/
@Excel(name = "鎵规鍙�", width = 15)
@ApiModelProperty(value = "鎵规鍙�")
- private String batchNum;
+ private java.lang.String batchNum;
/**鍑哄巶鏃ユ湡*/
@Excel(name = "鍑哄巶鏃ユ湡", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -78,14 +78,14 @@
/**渚涘簲鍟�*/
@Excel(name = "渚涘簲鍟�", width = 15)
@ApiModelProperty(value = "渚涘簲鍟�")
- private String supplierId;
+ private java.lang.String supplierId;
/**鍒堕�犲晢*/
@Excel(name = "鍒堕�犲晢", width = 15)
@ApiModelProperty(value = "鍒堕�犲晢")
- private String constructorId;
+ private java.lang.String constructorId;
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorage.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorage.java
index b204173..3d66a00 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorage.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorage.java
@@ -33,31 +33,31 @@
/**鐢宠鍗曠紪鐮�*/
@Excel(name = "鐢宠鍗曠紪鐮�", width = 15)
@ApiModelProperty(value = "鐢宠鍗曠紪鐮�")
- private String num;
+ private java.lang.String num;
/**鏀惰揣浠撳簱id*/
@Excel(name = "鏀惰揣浠撳簱id", width = 15)
@ApiModelProperty(value = "鏀惰揣浠撳簱id")
@Dict(dictTable = "mom_base_warehouse",dicCode = "id",dicText = "name")
- private String warehouseId;
+ private java.lang.String warehouseId;
/**閲囪喘閮ㄩ棬ID*/
@Excel(name = "閲囪喘閮ㄩ棬ID", width = 15)
@ApiModelProperty(value = "閲囪喘閮ㄩ棬ID")
@Dict(dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
- private String departId;
+ private java.lang.String departId;
/**鍏ュ簱绫诲瀷*/
@Excel(name = "鍏ュ簱绫诲瀷", width = 15)
@ApiModelProperty(value = "鍏ュ簱绫诲瀷")
@Dict(dicCode = "spare_part_storage_type")
- private String type;
+ private java.lang.String type;
/**鐘舵�侊紙0宸插垱寤猴紝1宸叉彁浜わ紝2宸查�氳繃锛�3宸查┏鍥烇級*/
@Excel(name = "鐘舵�侊紙0宸插垱寤猴紝1宸叉彁浜わ紝2宸查�氳繃锛�3宸查┏鍥烇級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙0宸插垱寤猴紝1宸叉彁浜わ紝2宸查�氳繃锛�3宸查┏鍥�,4宸插畬鎴愶級")
@Dict(dicCode = "purchase_storage_status")
- private String status;
+ private java.lang.String status;
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
@TableField(exist = false)
private List<SparePartPurchaseStorageDetail> sparePartPurchaseStorageDetails;
@@ -71,6 +71,6 @@
/**鐢宠鍗曠紪鐮�*/
@Excel(name = "瀹℃壒鎰忚", width = 15)
@ApiModelProperty(value = "瀹℃壒鎰忚")
- private String approvalOpinions;
+ private java.lang.String approvalOpinions;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorageDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorageDetail.java
index e70d514..144c053 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorageDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartPurchaseStorageDetail.java
@@ -32,59 +32,59 @@
/**鍏ュ簱鐢宠鍗昳d*/
@Excel(name = "鍏ュ簱鐢宠鍗昳d", width = 15)
@ApiModelProperty(value = "鍏ュ簱鐢宠鍗昳d")
- private String sparePartPurchaseStorageId;
+ private java.lang.String sparePartPurchaseStorageId;
/**澶囦欢id*/
@Excel(name = "澶囦欢id", width = 15)
@ApiModelProperty(value = "澶囦欢id")
- private String sparePartId;
+ private java.lang.String sparePartId;
/**涓诲崟浣�*/
@Excel(name = "涓诲崟浣�", width = 15)
@ApiModelProperty(value = "涓诲崟浣�")
- private String mainUnitId;
+ private java.lang.String mainUnitId;
/**涓绘暟閲�*/
@Excel(name = "涓绘暟閲�", width = 15)
@ApiModelProperty(value = "涓绘暟閲�")
- private Double mainQuantity;
+ private java.lang.Double mainQuantity;
/**杈呭崟浣�*/
@Excel(name = "杈呭崟浣�", width = 15)
@ApiModelProperty(value = "杈呭崟浣�")
- private String auxiliaryUnitId;
+ private java.lang.String auxiliaryUnitId;
/**杈呮暟閲�*/
@Excel(name = "杈呮暟閲�", width = 15)
@ApiModelProperty(value = "杈呮暟閲�")
- private Double auxiliaryQuantity;
+ private java.lang.Double auxiliaryQuantity;
/**鍒堕�犲晢*/
@Excel(name = "鍒堕��", width = 15)
@ApiModelProperty(value = "鍒堕�犲晢")
- private String constructorId;
+ private java.lang.String constructorId;
/**渚涘簲鍟�*/
@Excel(name = "渚涘簲鍟�", width = 15)
@ApiModelProperty(value = "渚涘簲鍟�")
- private String supplierId;
+ private java.lang.String supplierId;
@Excel(name = "浠撳簱id", width = 15)
@ApiModelProperty(value = "浠撳簱id")
@Dict(dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
- private String warehouseId;
+ private java.lang.String warehouseId;
@Excel(name = "搴撳尯id", width = 15)
@ApiModelProperty(value = "搴撳尯id")
@Dict(dictTable = "mom_base_warehouse_area", dicCode = "id", dicText = "name")
- private String warehouseAreaId;
+ private java.lang.String warehouseAreaId;
@Excel(name = "搴撲綅id", width = 15)
@ApiModelProperty(value = "搴撲綅id")
@Dict(dictTable = "mom_base_warehouse_location", dicCode = "id", dicText = "name")
- private String warehouseLocationId;
+ private java.lang.String warehouseLocationId;
@Excel(name = "鎵规鍙�", width = 15)
@ApiModelProperty(value = "鎵规鍙�")
- private String batchNum;
+ private java.lang.String batchNum;
@Excel(name = "鐘舵�侊紙0鏈叆搴擄紝1宸插叆搴擄級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙0鏈叆搴擄紝1宸插叆搴擄級")
- private String status;
+ private java.lang.String status;
@Excel(name = "鍑哄巶鏃ユ湡", width = 15)
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
@@ -95,5 +95,5 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartReceive.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartReceive.java
index e17914c..4e510e6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartReceive.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartReceive.java
@@ -37,14 +37,14 @@
@Excel(name = "浠撳簱id", width = 15)
@ApiModelProperty(value = "浠撳簱id")
@Dict(dictTable = "mom_base_warehouse", dicText = "name", dicCode = "id")
- private String warehouseId;
+ private java.lang.String warehouseId;
/**
* 棰嗙敤閮ㄩ棬ID
*/
@Excel(name = "棰嗙敤閮ㄩ棬ID", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@ApiModelProperty(value = "棰嗙敤閮ㄩ棬ID")
- private String departId;
+ private java.lang.String departId;
/**
* 棰嗙敤浜篿d
*/
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartScrap.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartScrap.java
index dfeff5d..1f2e198 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartScrap.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartScrap.java
@@ -1,21 +1,17 @@
package org.jeecg.modules.spare.entity;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecg.modules.eam.entity.RepairOrderDetail;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.List;
/**
* @Description: 澶囦欢鎶ュ簾
@@ -92,7 +88,7 @@
*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 鐘舵�� 0 绂佺敤 1 鍚敤
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
index c4886ea..7b5386f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java
@@ -29,26 +29,26 @@
*/
@Excel(name = "澶囦欢id", width = 15)
@ApiModelProperty(value = "澶囦欢id")
- private String sparePartId;
+ private java.lang.String sparePartId;
/**
* 鎵规鍙�
*/
@Excel(name = "鎵规鍙�", width = 15)
@ApiModelProperty(value = "鎵规鍙�")
- private String batchNum;
+ private java.lang.String batchNum;
/**
* 澶辨晥棰勬姤璀�
*/
@Excel(name = "澶辨晥棰勬姤璀�", width = 15)
@ApiModelProperty(value = "澶辨晥棰勬姤璀�")
- private String validityForecast;
+ private java.lang.String validityForecast;
/**
* 搴撳瓨棰勬姤璀�
*/
@Excel(name = "搴撳瓨棰勬姤璀�", width = 15)
@ApiModelProperty(value = "搴撳瓨棰勬姤璀�")
- private String inventoryForecast;
+ private java.lang.String inventoryForecast;
/**
@@ -57,48 +57,48 @@
@Excel(name = "鍒堕�犲晢", width = 15)
@ApiModelProperty(value = "鍒堕�犲晢")
@Dict(dictTable = "mom_base_constructor", dicCode = "id", dicText = "name")
- private String constructorId;
+ private java.lang.String constructorId;
/**
* 涓诲崟浣峣d
*/
@Excel(name = "涓诲崟浣峣d", width = 15)
@ApiModelProperty(value = "涓诲崟浣峣d")
@Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
- private String mainUnitId;
+ private java.lang.String mainUnitId;
/**
* 杈呭崟浣峣d
*/
@Excel(name = "杈呭崟浣峣d", width = 15)
@ApiModelProperty(value = "杈呭崟浣峣d")
@Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
- private String auxiliaryUnitId;
+ private java.lang.String auxiliaryUnitId;
@Excel(name = "浠撳簱id", width = 15)
@ApiModelProperty(value = "浠撳簱id")
@Dict(dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
- private String warehouseId;
+ private java.lang.String warehouseId;
@Excel(name = "搴撳尯id", width = 15)
@ApiModelProperty(value = "搴撳尯id")
@Dict(dictTable = "mom_base_warehouse_area", dicCode = "id", dicText = "name")
- private String warehouseAreaId;
+ private java.lang.String warehouseAreaId;
@Excel(name = "搴撲綅id", width = 15)
@ApiModelProperty(value = "搴撲綅id")
@Dict(dictTable = "mom_base_warehouse_location", dicCode = "id", dicText = "name")
- private String warehouseLocationId;
+ private java.lang.String warehouseLocationId;
/**
* 涓绘暟閲�
*/
@Excel(name = "涓绘暟閲�", width = 15)
@ApiModelProperty(value = "涓绘暟閲�")
- private Double mainQuantity;
+ private java.lang.Double mainQuantity;
/**
* 杈呮暟閲�
*/
@Excel(name = "杈呮暟閲�", width = 15)
@ApiModelProperty(value = "杈呮暟閲�")
- private Double auxiliaryQuantity;
+ private java.lang.Double auxiliaryQuantity;
/**
@@ -122,14 +122,14 @@
*/
@Excel(name = "鏈夋晥鏈�", width = 15)
@ApiModelProperty(value = "鏈夋晥鏈�")
- private Integer validityPeriod;
+ private java.lang.Integer validityPeriod;
/**
* 绉熸埛id
*/
@Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
+ private java.lang.String tenantId;
/**
@@ -150,37 +150,37 @@
*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private java.lang.String remark;
/**
* 澶囩敤瀛楁1
*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁1")
- private String sparesUda1;
+ private java.lang.String sparesUda1;
/**
* 澶囩敤瀛楁2
*/
@Excel(name = "澶囩敤瀛楁2", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁2")
- private String sparesUda2;
+ private java.lang.String sparesUda2;
/**
* 澶囩敤瀛楁3
*/
@Excel(name = "澶囩敤瀛楁3", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁3")
- private String sparesUda3;
+ private java.lang.String sparesUda3;
/**
* 澶囩敤瀛楁4
*/
@Excel(name = "澶囩敤瀛楁4", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁4")
- private String sparesUda4;
+ private java.lang.String sparesUda4;
/**
* 澶囩敤瀛楁5
*/
@Excel(name = "澶囩敤瀛楁5", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁5")
- private String sparesUda5;
+ private java.lang.String sparesUda5;
/**
* 澶囦欢鍚嶇О
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesScrapDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesScrapDetail.java
index fc36037..f0c9674 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesScrapDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesScrapDetail.java
@@ -1,18 +1,19 @@
package org.jeecg.modules.spare.entity;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableField;
+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 org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
/**
* @Description: 璁惧鎶ュ簾鏄庣粏琛�
@@ -90,7 +91,7 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
/**鐘舵�� 0 绂佺敤 1 鍚敤*/
@Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java
index 0044640..39e3872 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceivePage.java
@@ -39,14 +39,14 @@
*/
@Excel(name = "浠撳簱id", width = 15)
@ApiModelProperty(value = "浠撳簱id")
- private String warehouseId;
+ private java.lang.String warehouseId;
/**
* 棰嗙敤閮ㄩ棬ID
*/
@Excel(name = "棰嗙敤閮ㄩ棬ID", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@ApiModelProperty(value = "棰嗙敤閮ㄩ棬ID")
- private String departId;
+ private java.lang.String departId;
/**
* 棰嗙敤浜篿d
*/
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java
index 3cf32d5..16d45cb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartReceiveVo.java
@@ -241,14 +241,14 @@
@Excel(name = "鍒涘缓鏃堕棿", width = 20, 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")
- private Date createTime;
+ private java.util.Date createTime;
/**
* 鏇存柊浜�
*/
@ApiModelProperty(value = "鏇存柊浜�")
@Excel(name = "鏇存柊浜�", width = 15)
- private String updateBy;
+ private java.lang.String updateBy;
/**
* 鏇存柊鏃堕棿
@@ -257,5 +257,5 @@
@Excel(name = "鏇存柊鏃堕棿", width = 20, 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")
- private Date updateTime;
+ private java.util.Date updateTime;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java
index ef51844..b875a89 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/vo/SparePartVo.java
@@ -160,7 +160,7 @@
*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
- private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ private java.lang.Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 鐘舵�� 0 绂佺敤 1 鍚敤
--
Gitblit v1.9.3