From fde3a7fbef625a679f1f3582df3ee39276005b59 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 14 三月 2024 16:38:42 +0800
Subject: [PATCH] xg
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java | 13 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 52 ++++++++++++++++++++++----
3 files changed, 58 insertions(+), 8 deletions(-)
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 1776799..410cb3d 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
@@ -18,6 +18,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
+
+import java.util.ArrayList;
import java.util.Arrays;
import org.jeecg.common.util.oConvertUtils;
import io.swagger.annotations.Api;
@@ -33,7 +35,6 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.io.IOException;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -98,6 +99,12 @@
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<EquipmentMaintenancePlan> queryWrapper = QueryGenerator.initQueryWrapper(equipmentMaintenancePlan, req.getParameterMap());
+ //鎸夊垱寤烘椂闂磋寖鍥存煡璇�,浠庡墠绔帴鏀朵袱涓弬鏁帮紝beginTime鍜宔ndTime
+ String beginTime = req.getParameter("beginTime");
+ String endTime = req.getParameter("endTime");
+ if(oConvertUtils.isNotEmpty(beginTime) && oConvertUtils.isNotEmpty(endTime)){
+ queryWrapper.between("create_time",beginTime,endTime);
+ }
Page<EquipmentMaintenancePlan> page = new Page<EquipmentMaintenancePlan>(pageNo, pageSize);
IPage<EquipmentMaintenancePlan> pageList = equipmentMaintenancePlanService.page(page, queryWrapper);
return Result.OK(pageList);
@@ -113,15 +120,44 @@
@PostMapping(value = "/add")
@Transactional(rollbackFor = {Exception.class})
public Result<String> add(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) {
- equipmentMaintenancePlan.setStatus("created");
- List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlan.getEquipmentMaintenancePlanDetailList();
- equipmentMaintenancePlan.setEquipNo(equipmentMaintenancePlanDetails.size());
+ //鍒ゆ柇selectOption绫诲瀷
+ equipmentMaintenancePlan.setStatus("created");
equipmentMaintenancePlan.setDelFlag(CommonConstant.DEL_FLAG_0);
- equipmentMaintenancePlanService.save(equipmentMaintenancePlan);
- for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){
- equipmentMaintenancePlanDetail.setPlanId(equipmentMaintenancePlan.getId());
+ if(equipmentMaintenancePlan.getSelectOption().equals("0")){
+ //鏌ヨ鎵�鏈夎澶囧苟灏嗗叾id灏佽鎴恑dList
+ List<Equipment> equipments = equipmentService.list();
+ List<String> idList = equipments.stream().map(Equipment::getId).collect(Collectors.toList());
+ //鏍规嵁idList鍜宼ype鏌ヨ鎵�鏈夎澶囩殑淇濆吇鏍囧噯
+ Map<String, Object> maintenanceStandards = equipmentMaintenancePlanService.getStandards(idList,equipmentMaintenancePlan.getType());
+ List<MaintenanceStandard> maintenanceStandardList = (List<MaintenanceStandard>) maintenanceStandards.get("records");
+ //寰幆maintenanceStandardList灏嗘暟鎹皝瑁呭埌equipmentMaintenancePlanDetailList
+ List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetailList = new ArrayList<>();
+ equipmentMaintenancePlan.setEquipNo(maintenanceStandardList.size());
+ equipmentMaintenancePlanService.save(equipmentMaintenancePlan);
+ for(MaintenanceStandard maintenanceStandard:maintenanceStandardList){
+ EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail = new EquipmentMaintenancePlanDetail();
+ equipmentMaintenancePlanDetail.setStandardNum(maintenanceStandard.getNum());
+ equipmentMaintenancePlanDetail.setEquipmentName(maintenanceStandard.getEquipmentName());
+ equipmentMaintenancePlanDetail.setEquipmentId(maintenanceStandard.getEquipmentId());
+ equipmentMaintenancePlanDetail.setEquipmentNum(maintenanceStandard.getEquipmentNum());
+ equipmentMaintenancePlanDetail.setModel(maintenanceStandard.getEquipmentModel());
+ equipmentMaintenancePlanDetail.setStandardId(maintenanceStandard.getId());
+ equipmentMaintenancePlanDetail.setPlanId(equipmentMaintenancePlan.getId());
+ equipmentMaintenancePlanDetail.setPlanStartTime(equipmentMaintenancePlan.getBeginTime());
+ equipmentMaintenancePlanDetail.setPlanEndTime(equipmentMaintenancePlan.getEndTime());
+ equipmentMaintenancePlanDetailList.add(equipmentMaintenancePlanDetail);
+ }
+ equipmentMaintenancePlanDetailService.saveBatch(equipmentMaintenancePlanDetailList);
}
- equipmentMaintenancePlanDetailService.saveBatch(equipmentMaintenancePlanDetails);
+ else{
+ List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlan.getEquipmentMaintenancePlanDetailList();
+ equipmentMaintenancePlan.setEquipNo(equipmentMaintenancePlanDetails.size());
+ equipmentMaintenancePlanService.save(equipmentMaintenancePlan);
+ for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){
+ equipmentMaintenancePlanDetail.setPlanId(equipmentMaintenancePlan.getId());
+ }
+ equipmentMaintenancePlanDetailService.saveBatch(equipmentMaintenancePlanDetails);
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
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 93cfc09..c73c6ab 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
@@ -73,4 +73,17 @@
private List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetailList;
private String createReason;
+//鎶ヨ繖涓敊rejected value ["2024-03-14T06:26:38.692Z"]
+
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ private Date beginTime;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ private Date endTime;
+ @TableField(exist = false)
+ private String selectOption;
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java
index 82c5df4..caa319d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java
@@ -92,4 +92,5 @@
}
+
}
--
Gitblit v1.9.3