From 3bef134da79cb768d6444d9a2fc68e0ca7cf7347 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 18 十月 2023 18:42:33 +0800
Subject: [PATCH] 鉴定
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnologyQuanlifyAlertJob.java | 15 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderDetailService.java | 4 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java | 8 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 26 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 83 ++++++++++++++------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderDetailServiceImpl.java | 5 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderDetailMapper.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderDetailMapper.xml | 22 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderDetail.java | 15 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 5 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 17 ++++
15 files changed, 179 insertions(+), 30 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 7c2294b..5b9e3e7 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
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.Api;
@@ -20,14 +22,8 @@
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.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.entity.*;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.CalibrationOrderPage;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -45,6 +41,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@@ -69,6 +67,9 @@
private ICalibrationOrderReportService calibrationOrderReportService;
@Autowired
private IEamEquipmentService equipmentService;
+
+ @Autowired
+ private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
// @Autowired
// private IUploadRelaService uploadRelaService;
// @Autowired
@@ -502,16 +503,24 @@
for (CalibrationOrderDetail calibrationOrderDetail : calibrationOrderDetails) {
calibrationOrderDetailService.removeById(calibrationOrderDetail);
}
- List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(calibrationOrder.getEquipmentId());
- CalibrationOrderDetail calibrationOrderDetail = null;
- for (Map<String, Object> map : precisionParameterList) {
- calibrationOrderDetail = new CalibrationOrderDetail();
+ addAndEdit(calibrationOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ private void addAndEdit(@RequestBody CalibrationOrder calibrationOrder) {
+ String precisionParametersTemplateId = calibrationOrder.getCalibrationOrderUda1();
+ List<PrecisionParametersTemplateDetail> precisionParametersTemplateDetails = precisionParametersTemplateDetailService
+ .list(new QueryWrapper<PrecisionParametersTemplateDetail>()
+ .eq("precision_parameters_template_id",precisionParametersTemplateId)
+ .eq("del_flag",0));
+ for (PrecisionParametersTemplateDetail precisionParametersTemplateDetail : precisionParametersTemplateDetails) {
+ CalibrationOrderDetail calibrationOrderDetail = new CalibrationOrderDetail();
calibrationOrderDetail.setCalibrationOrderId(calibrationOrder.getId());
- calibrationOrderDetail.setEquipmentPrecisionParametersId((String)map.get("id"));
- calibrationOrderDetail.setPrecisionParametersId((String)map.get("precisionParametersId"));
+ calibrationOrderDetail.setCalibrationOrderDetailUda1(precisionParametersTemplateDetail.getId());
+ calibrationOrderDetail.setPrecisionParametersId(precisionParametersTemplateDetail.getPrecisionParametersId());
+ calibrationOrderDetail.setSort(precisionParametersTemplateDetail.getSort());
calibrationOrderDetailService.save(calibrationOrderDetail);
}
- return Result.OK("缂栬緫鎴愬姛!");
}
/**
@@ -523,15 +532,7 @@
public Result<String> addNew(@RequestBody CalibrationOrder calibrationOrder) {
calibrationOrder.setStatus("1");
calibrationOrderService.save(calibrationOrder);
- List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(calibrationOrder.getEquipmentId());
- CalibrationOrderDetail calibrationOrderDetail = null;
- for (Map<String, Object> map : precisionParameterList) {
- calibrationOrderDetail = new CalibrationOrderDetail();
- calibrationOrderDetail.setCalibrationOrderId(calibrationOrder.getId());
- calibrationOrderDetail.setEquipmentPrecisionParametersId((String)map.get("id"));
- calibrationOrderDetail.setPrecisionParametersId((String)map.get("precisionParametersId"));
- calibrationOrderDetailService.save(calibrationOrderDetail);
- }
+ addAndEdit(calibrationOrder);
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -598,4 +599,38 @@
calibrationOrderService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
+ @GetMapping(value = "/listByMainId")
+ public Result<IPage<CalibrationOrderDetail>> listByMainId(CalibrationOrderDetail calibrationOrderDetail,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<CalibrationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrderDetail, req.getParameterMap());
+ Page<CalibrationOrderDetail> page = new Page<CalibrationOrderDetail>(pageNo, pageSize);
+ IPage<CalibrationOrderDetail> pageList = calibrationOrderDetailService.pageList(page,calibrationOrderDetail.getCalibrationOrderId());
+ return Result.OK(pageList);
+ }
+ @RequestMapping(value = "/saveFinal", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> saveFinal(@RequestBody CalibrationOrder calibrationOrder) {
+ calibrationOrder.setCalibrationTime(new Date());
+ if(StringUtils.isNotBlank(calibrationOrder.getEquipmentId())){
+ String equipmentId = calibrationOrder.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ if(ObjectUtils.isNotNull(equipment)){
+ LocalDate currentDate = LocalDate.now();
+
+ // 娣诲姞30澶�
+ LocalDate dateAfter30Days = currentDate.plusDays(Integer.parseInt(equipment.getCheckPeriod()));
+ // 杞崲涓簀ava.util.Date
+ Date result = Date.from(dateAfter30Days.atStartOfDay(ZoneId.systemDefault()).toInstant());
+ equipment.setTechnologyStatus(calibrationOrder.getCalibrationOrderUda6());
+ equipment.setTechnologyStatusQualificationTime(new Date());
+ equipment.setNextTechnologyStatusQualificationTime(result);
+ equipmentService.updateById(equipment);
+ }
+
+
+ }
+ calibrationOrderService.updateById(calibrationOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 47949e0..8c06ac4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -706,7 +706,33 @@
.setPropertyStatus(equipmentImportVo.getPropertyStatus())
.setWarrantyStart(equipmentImportVo.getWarrantyStart())
.setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
+ .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
.setGpo(equipmentImportVo.getGpo());
+ if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
+ equipment.setCheckPeriod(365*3+"");
+ }
+ if(equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")){
+ equipment.setCheckPeriod(365*4+"");
+ }
+ if(equipmentCategory.getEquipmentCategoryUda1().equals("tester")){
+ equipment.setCheckPeriod(365*1+"");
+ }
+ if(
+ !equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")
+ &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
+ &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
+ ){
+ if(equipmentImportVo.getEquipmentImportanceId().equals("A")){
+ equipment.setCheckPeriod(365*3+"");
+ }
+ if(
+ equipmentImportVo.getEquipmentImportanceId().equals("B")
+ ||equipmentImportVo.getEquipmentImportanceId().equals("C")
+ ||equipmentImportVo.getEquipmentImportanceId().equals("D")
+ ){
+ equipment.setCheckPeriod(365*4+"");
+ }
+ }
equipmentService.save(equipment);
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;";
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
index 0fdd3ad..a77fde9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -70,6 +70,14 @@
@Autowired
private ISysBaseAPI sysBaseApi;
+ @Autowired
+ private IDailyMaintenanceOrderDetailService maintenanceOrderDetailService;
+
+ @Autowired
+ private IMaintenanceStandardDetailService maintenanceStandardDetailService;
+
+
+
/*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
@@ -235,6 +243,15 @@
dailyMaintenanceOrder.setPrecisionInspectionStatus(CommonConstant.STATUS_0);
dailyMaintenanceOrder.setStoveExemptStatus(CommonConstant.STATUS_0);
dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
+ for(MaintenanceStandardDetail maintenanceStandardDetail:maintenanceStandardDetailList){
+ DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail = new DailyMaintenanceOrderDetail();
+ dailyMaintenanceOrderDetail.setDailyMaintenanceOrderId(dailyMaintenanceOrder.getId());
+ dailyMaintenanceOrderDetail.setMaintenanceStandardDetailId(maintenanceStandardDetail.getId());
+ dailyMaintenanceOrderDetail.setMaintenanceStandardId(maintenanceStandard.getId());
+ dailyMaintenanceOrderDetail.setMaintenanceProjectId(maintenanceStandardDetail.getMaintenanceProjectId());
+ dailyMaintenanceOrderDetail.setDelFlag(0);
+ maintenanceOrderDetailService.save(dailyMaintenanceOrderDetail);
+ }
}
equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan);
String msg = "鍗曟嵁鍙蜂负銆�"+equipmentMaintenancePlan.getNum()+"銆戠殑淇濆吇璁″垝宸茬敓鎴愪繚鍏诲伐鍗�";
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 b961f83..c1a1b22 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
@@ -152,6 +152,7 @@
*/
@Excel(name = "澶囩敤瀛楁6", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁6")
+ @Dict(dicCode = "technology_status")
private String calibrationOrderUda6;
/**
* 浼佷笟ID
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderDetail.java
index 155f012..c21b36e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrderDetail.java
@@ -161,4 +161,19 @@
*/
@TableField(exist = false)
private List<CalibrationOrderDetail> calibrationOrderDetails;
+ @TableField(exist = false)
+ private String tolerance;
+ @TableField(exist = false)
+ private Double distance;
+ @TableField(exist = false)
+ private Double base;
+ @TableField(exist = false)
+ private Double upper;
+ @TableField(exist = false)
+ private Double lower;
+ @TableField(exist = false)
+ private String precisionParametersUda1;
+ @TableField(exist = false)
+ private String name;
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 1bd959f..7b51b55 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -367,4 +367,5 @@
private String equipmentCategoryUda1;
@TableField(exist = false)
private String maintenanceOrderId;
+ private String checkPeriod;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
index b2b8041..cbe80f0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
@@ -128,6 +128,9 @@
@Excel(dicCode = "property_status",name = "璧勪骇鐘舵��")
private String propertyStatus;
+ @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyyMMdd")
+ private Date nextTechnologyStatusQualificationTime;
+
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java
index 440184b..7676617 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java
@@ -52,16 +52,16 @@
@ApiModelProperty(value = "createBy")
private java.lang.String createBy;
/**createTime*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private java.util.Date createTime;
/**updateBy*/
@ApiModelProperty(value = "updateBy")
private java.lang.String updateBy;
/**updateTime*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private java.util.Date updateTime;
/**delFlag*/
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnologyQuanlifyAlertJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnologyQuanlifyAlertJob.java
new file mode 100644
index 0000000..d5f484e
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnologyQuanlifyAlertJob.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.eam.job;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+/**
+ * @author lnl
+ */
+public class TechnologyQuanlifyAlertJob implements Job {
+ @Override
+ public void execute(JobExecutionContext context) throws JobExecutionException {
+
+ }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderDetailMapper.java
index 5e2b645..db40210 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderDetailMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderDetailMapper.java
@@ -4,6 +4,7 @@
import java.util.Map;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.CalibrationOrderDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -32,7 +33,7 @@
*/
public List<CalibrationOrderDetail> selectByMainId(@Param("mainId") String mainId);
-
+ public List<CalibrationOrderDetail> pageList(Page<CalibrationOrderDetail>page, @Param("mainId") String mainId);
/**
* 璁惧妫�瀹氬伐鍗� 鎵ц鏃惰幏鍙栫簿搴﹀弬鏁�
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderDetailMapper.xml
index ce69eb4..43187da 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderDetailMapper.xml
@@ -36,4 +36,26 @@
</if>
ORDER BY t1.create_time desc
</select>
+ <select id="pageList" resultType="org.jeecg.modules.eam.entity.CalibrationOrderDetail">
+ SELECT
+ t1.id,
+ t1.sort,
+ t1.actual_value actualValue,
+ t2.tolerance,
+ t2.distance,
+ t2.base,
+ t2.upper,
+ t2.lower,
+ t3.name,
+ t3.precision_parameters_uda1 precisionParametersUda1
+ FROM
+ mom_eam_calibration_order_detail t1
+ LEFT JOIN mom_eam_precision_parameters_template_detail t2 ON t1.calibration_order_detail_uda1 = t2.id
+ LEFT JOIN mom_eam_precision_parameters t3 ON t1.precision_parameters_id = t3.id
+ WHERE t1.del_flag = 0
+ <if test="mainId != null and mainId != ''">
+ and t1.calibration_order_id = #{mainId}
+ </if>
+ ORDER BY t1.sort asc
+ </select>
</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index cbe4593..3e657d1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -244,7 +244,10 @@
t1.work_center_id workCenterId,
t1.warranty_start warrantyStart,
t1.warranty_end warrantyEnd,
- t1.property_status propertyStatus
+ t1.property_status propertyStatus,
+ t1.check_period checkPeriod,
+ t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime,
+ t1.technology_status_qualification_time technologyStatusQualificationTime
from mom_eam_equipment t1
left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
where t1.del_flag = 0
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml
index 0d5548a..61b1f95 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml
@@ -4,6 +4,7 @@
<select id="getCycle" resultType="org.jeecg.modules.eam.entity.MaintenanceStandardDetail">
select
t1.id id,
+ t1.maintenance_project_id maintenanceProjectId,
t2.id maintenanceCycleId
from mom_eam_maintenance_standard_detail t1
left join mom_eam_maintenance_cycle t2 on t2.id = t1.maintenance_cycle_id
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderDetailService.java
index 2c6a2c1..08a7d0d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderDetailService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ICalibrationOrderDetailService.java
@@ -2,7 +2,9 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.CalibrationOrderDetail;
import java.util.List;
@@ -25,6 +27,8 @@
*/
List<CalibrationOrderDetail> selectByMainId(String mainId);
+ public Page<CalibrationOrderDetail> pageList(Page<CalibrationOrderDetail> page, String mainId);
+
/**
* 鏍规嵁妫�瀹氬伐鍗昳d鍒犻櫎妫�瀹氬伐鍗曟槑缁�
*
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderDetailServiceImpl.java
index dfdac2c..76d96fc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderDetailServiceImpl.java
@@ -32,6 +32,11 @@
return calibrationOrderDetailMapper.selectByMainId(mainId);
}
+ @Override
+ public Page<CalibrationOrderDetail> pageList(Page<CalibrationOrderDetail> page, String mainId) {
+ return page.setRecords(baseMapper.pageList(page,mainId));
+ }
+
/**
* 鏍规嵁妫�瀹氬伐鍗昳d鍒犻櫎妫�瀹氬伐鍗曟槑缁�
*
--
Gitblit v1.9.3