From 04ef88cee361ec8730c400d96250a6c1cd9f9d80 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 08 九月 2023 16:23:47 +0800
Subject: [PATCH] 设备台账 1.ABC标识变更记录功能 2.质保日期变更记录功能 3.质保到期提醒 4.ABC标识与关键设备标识联动 5.设备质保期字段添加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java
index 3bf58bc..3fa85bf 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PlanChangeApplyController.java
@@ -10,7 +10,12 @@
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.common.util.DateUtils;
+import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
+import org.jeecg.modules.eam.entity.MaintenanceCycle;
import org.jeecg.modules.eam.entity.PlanChangeApply;
+import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
+import org.jeecg.modules.eam.service.IMaintenanceCycleService;
import org.jeecg.modules.eam.service.IPlanChangeApplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,8 +24,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.Date;
- /**
+/**
* @Description: mom_eam_plan_change_apply
* @Author: jeecg-boot
* @Date: 2023-09-04
@@ -33,6 +39,12 @@
public class PlanChangeApplyController extends JeecgController<PlanChangeApply, IPlanChangeApplyService> {
@Autowired
private IPlanChangeApplyService planChangeApplyService;
+
+ @Autowired
+ private IDailyMaintenanceOrderService dailyMaintenanceOrderService;
+
+ @Autowired
+ private IMaintenanceCycleService maintenanceCycleService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -67,7 +79,31 @@
//@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_plan_change_apply:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody PlanChangeApply planChangeApply) {
+ planChangeApply.setMaintenanceOrderId(planChangeApply.getId());
+ planChangeApply.setId("");
planChangeApplyService.save(planChangeApply);
+
+ /**
+ * 鏍规嵁鐢宠寤朵繚鏃堕棿 閲嶆柊璁＄畻宸ュ崟鐨勭粨鏉熸椂闂�
+ */
+ DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(planChangeApply.getMaintenanceOrderId());
+ String maintenanceCycleId = dailyMaintenanceOrder.getMaintenanceCycleId();
+ Date planDelayTime = planChangeApply.getPlanDelayTime();
+ MaintenanceCycle maintenanceCycle = maintenanceCycleService.getById(maintenanceCycleId);
+ String unit = maintenanceCycle.getUnit();
+ int effectiveTime = maintenanceCycle.getEffectiveTime().intValue();
+ Date date = null;
+ if ("min".equals(unit)) {
+ date = DateUtils.getMinAfter(planDelayTime, effectiveTime);
+ } else if ("hour".equals(unit)) {
+ date = DateUtils.getHourAfter(planDelayTime, effectiveTime);
+ } else if ("day".equals(unit)) {
+ date = DateUtils.getDayAfter(planDelayTime, effectiveTime);
+ }
+ dailyMaintenanceOrder.setPlanEndTime(date);
+ dailyMaintenanceOrder.setPlanStartTime(planDelayTime);
+ dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);
+
return Result.OK("娣诲姞鎴愬姛锛�");
}
--
Gitblit v1.9.3