From bdcf57bd9679e916b378f1384d875dff6579033e Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 27 十一月 2023 11:18:09 +0800
Subject: [PATCH] 优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
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 cdedcbf..70ffd5e 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
@@ -6,6 +6,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -151,7 +152,7 @@
if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
}
-
+ queryWrapper.isNull("line_id");
queryWrapper.eq("status","1");
queryWrapper.eq("del_flag",0);
queryWrapper.orderByDesc("create_time");
@@ -332,6 +333,7 @@
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
Equipment equipment = equipmentService.getById(id);
+ equipmentService.update(new UpdateWrapper<Equipment>().eq("line_id",id).set("line_id",null).set("is_meta",null));
equipment.setDelFlag(1);
equipmentService.updateById(equipment);
return Result.OK("鍒犻櫎鎴愬姛!");
@@ -571,6 +573,8 @@
String manageId = equipmentImportVo.getManageId();
String constructorId = equipmentImportVo.getConstructorId();
String teamId = equipmentImportVo.getTeamId();
+ String propertyStatus = equipmentImportVo.getPropertyStatus();
+ String abc = equipmentImportVo.getEquipmentImportanceId();
if(StringUtils.isBlank(equipmentImportVo.getNum())){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栫爜缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
@@ -681,7 +685,7 @@
// }
else{
SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()),false);
- if(ObjectUtils.isNull(useId)){
+ if(ObjectUtils.isNotNull(use)){
equipment.setUseId(use.getId());
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ浣跨敤閮ㄩ棬,璇风淮鎶ら儴闂ㄦ暟鎹悗鍐嶅鍏�;";
@@ -739,13 +743,14 @@
equipment.setConstructorId(constructor.getId());
}
}
- if(equipmentImportVo.getPropertyStatus().equals("warranty")){
+ if(StringUtils.isNotBlank(propertyStatus)&&propertyStatus.equals("warranty")){
if(
ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璇ヨ澶囧浜庤川淇濇湡锛岃川淇濅俊鎭己澶憋紝璇峰厛缁存姢璐ㄤ繚寮�濮嬫椂闂存垨缁撴潫鏃堕棿;";
exceptionNum++;
+ continue;
}
}else{
@@ -797,16 +802,18 @@
&&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
&&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
){
- if(equipmentImportVo.getEquipmentImportanceId().equals("A")){
- equipment.setCheckPeriod(365*3+"");
+ if(StringUtils.isNotBlank(abc)){
+ if(abc.equals("A")){
+ equipment.setCheckPeriod(365*3+"");
+ }
+ if(
+ abc.equals("B")
+ ||abc.equals("C")
+ ||abc.equals("D")
+ ){
+ equipment.setCheckPeriod(365*4+"");
+ }
}
- if(
- equipmentImportVo.getEquipmentImportanceId().equals("B")
- ||equipmentImportVo.getEquipmentImportanceId().equals("C")
- ||equipmentImportVo.getEquipmentImportanceId().equals("D")
- ){
- equipment.setCheckPeriod(365*4+"");
- }
}
equipmentService.save(equipment);
}else {
@@ -844,9 +851,33 @@
HttpServletRequest req) {
QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
- IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId());
+ IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId(),standardDetail.getType());
return Result.OK(pageList);
}
+ @PostMapping("addLine")
+ @Transactional(rollbackFor = {Exception.class})
+ public Result<?> addLine(@RequestBody Equipment equipment){
+ equipmentService.save(equipment);
+ List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
+ for(Equipment equipment1:equipmentList){
+ equipment1.setId(equipment1.getShowId());
+ equipment1.setLineId(equipment.getId());
+ }
+ equipmentService.updateBatchById(equipmentList);
+ return Result.OK("娣诲姞鎴愬姛");
+ }
+ @PutMapping("editLine")
+ @Transactional(rollbackFor = {Exception.class})
+ public Result<?> editLine(@RequestBody Equipment equipment){
+ equipmentService.updateById(equipment);
+ equipmentService.update(new UpdateWrapper<Equipment>().eq("line_id",equipment.getId()).set("line_id",null).set("is_meta",null));
+ List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
+ for(Equipment equipment1:equipmentList){
+ equipment1.setLineId(equipment.getId());
+ }
+ equipmentService.updateBatchById(equipmentList);
+ return Result.OK("缂栬緫鎴愬姛");
+ }
}
--
Gitblit v1.9.3