From b17ab31f94fb11f7098e4c91f9b4386b2020f676 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 28 十二月 2023 11:16:02 +0800
Subject: [PATCH] 提交
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 388 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 282 insertions(+), 106 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 4d588b7..e9fd024 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,17 +6,22 @@
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;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.PermissionData;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.base.entity.Constructor;
+import org.jeecg.modules.base.service.IConstructorService;
+import org.jeecg.modules.base.service.IFactoryModelService;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.model.DepartVo;
import org.jeecg.modules.eam.service.*;
@@ -28,6 +33,8 @@
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,10 +68,10 @@
@Autowired
private IProcessParametersTemplateDetailService processParametersTemplateDetailService;
- @Autowired
+ @Autowired
private IEquipmentProcessParametersService equipmentProcessParametersService;
- @Autowired
+ @Autowired
private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;
@Autowired
@@ -72,8 +79,6 @@
@Autowired
private IProcessParametersTemplateService processParametersTemplateService;
-
-
@Autowired
private ISysBaseAPI sysBaseApi;
@@ -98,6 +103,22 @@
@Autowired
private IEquipmentCategoryService equipmentCategoryService;
+
+ @Autowired
+ private ISysDepartService departService;
+
+ @Autowired
+ private ITeamService teamService;
+
+ @Autowired
+ private IConstructorService constructorService;
+
+ @Autowired
+ private IAreaService areaService;
+
+
+
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -131,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");
@@ -179,16 +200,22 @@
* 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
* qsw 2023-7-14
*/
+
@GetMapping(value = "/getEquipmentList")
+ @PermissionData
public Result<IPage<Equipment>> getEquipmentList(Equipment equipment,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
- queryWrapper.eq("status","1");
- queryWrapper.eq("del_flag",0);
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
- IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment);
+ return Result.OK(pageList);
+ }
+
+ @GetMapping(value = "/pageEquipment")
+ public Result<IPage<Equipment>> pageEquipment(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
+ IPage<Equipment> pageList = equipmentService.pageEquipment(pageNo, pageSize, params);
return Result.OK(pageList);
}
@@ -306,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("鍒犻櫎鎴愬姛!");
@@ -461,34 +489,34 @@
@GetMapping(value = "/getResumeCalibrationRecordList")
public Result<?> getResumeCalibrationRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
IPage<Map<String, Object>> resumeCalibrationRecordList = equipmentService.getResumeCalibrationRecordList(pageNo, pageSize, params);
- for (Map<String, Object> record : resumeCalibrationRecordList.getRecords()) {
- String id = (String)record.get("id");
- String status = (String)record.get("status");
- String managementMode = (String)record.get("managementMode");
- if("4".equals(status)){
- if("data".equals(managementMode)){
- List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
- .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
- .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
- .eq(CalibrationOrderDetail::getDelFlag,"0").list();
- if(calibrationOrderDetails.size()>0){
- record.put("calibrationResult","寮傚父");
- }else{
- record.put("calibrationResult","姝ｅ父甯�");
- }
- }else{
- List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
- .eq(CalibrationOrderReport::getCalibrationOrderId, id)
- .eq(CalibrationOrderReport::getJudgmentResult, "fail")
- .eq(CalibrationOrderReport::getDelFlag, "0").list();
- if(calibrationOrderReports.size()>0){
- record.put("calibrationResult","寮傚父");
- }else{
- record.put("calibrationResult","姝ｅ父甯�");
- }
- }
- }
- }
+// for (Map<String, Object> record : resumeCalibrationRecordList.getRecords()) {
+// String id = (String)record.get("id");
+// String status = (String)record.get("status");
+// String managementMode = (String)record.get("managementMode");
+// if("4".equals(status)){
+// if("data".equals(managementMode)){
+// List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
+// .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
+// .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
+// .eq(CalibrationOrderDetail::getDelFlag,"0").list();
+// if(calibrationOrderDetails.size()>0){
+// record.put("calibrationResult","寮傚父");
+// }else{
+// record.put("calibrationResult","姝ｅ父甯�");
+// }
+// }else{
+// List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
+// .eq(CalibrationOrderReport::getCalibrationOrderId, id)
+// .eq(CalibrationOrderReport::getJudgmentResult, "fail")
+// .eq(CalibrationOrderReport::getDelFlag, "0").list();
+// if(calibrationOrderReports.size()>0){
+// record.put("calibrationResult","寮傚父");
+// }else{
+// record.put("calibrationResult","姝ｅ父甯�");
+// }
+// }
+// }
+// }
return Result.ok(resumeCalibrationRecordList);
}
@@ -516,12 +544,14 @@
queryWrapper.in("equipment_status",statusList);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
- }/**
+ }
+ /**
* 瀵煎叆
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@Transactional(rollbackFor = Exception.class)
+ //宸ュ尯銆佸瀷鍙枫�佽澶囩姸鎬併�佹妧鏈姸鎬併�丄BC鏍囪瘑鏈夌┖鍊硷紱缁存姢閮ㄩ棬銆佺淮淇彮缁勪负缂栫爜闇�瑕佹湁瀵圭収鍊笺��
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -535,147 +565,210 @@
try {
List<EquipmentImportVo> list = ExcelImportUtil.importExcel(file.getInputStream(), EquipmentImportVo.class, params);
for(int i = 0;i<list.size();i++){
+ Equipment equipment = new Equipment();
EquipmentImportVo equipmentImportVo = list.get(i);
- EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(new QueryWrapper<EquipmentCategory>().eq("name",equipmentImportVo.getEquipmentCategoryName()),false);
+ String equipmentCategoryName = equipmentImportVo.getEquipmentCategoryName();
+ String useId = equipmentImportVo.getUseId();
+ String areaId = equipmentImportVo.getFactoryModelId();
+ 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++;
+ continue;
}
else if(StringUtils.isBlank(equipmentImportVo.getName())){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍚嶇О缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
+ continue;
}
- else if(StringUtils.isBlank(equipmentImportVo.getUseId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- }
-// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda1())){
-// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:宸ュ尯缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:ABC鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
+// continue;
// }
- else if(StringUtils.isBlank(equipmentImportVo.getManageId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁存姢閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- }
- else if(StringUtils.isBlank(equipmentImportVo.getTeamId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁翠慨鐝粍缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- }
- else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:ABC鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- }
- else if(StringUtils.isBlank(equipmentImportVo.getEquipmentCategoryName())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍒嗙被缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- }
else if(StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
+ continue;
}
else if(StringUtils.isBlank(equipmentImportVo.getTechnologyStatus())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鎶�鏈己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鎶�鏈姸鎬佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
+ continue;
}
- else if(StringUtils.isBlank(equipmentImportVo.getFactoryModelId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:杞﹂棿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ else if(StringUtils.isBlank(equipmentImportVo.getModel())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
+ continue;
}
- else if(StringUtils.isBlank(equipmentImportVo.getWorkCenterId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浜х嚎缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ else if(StringUtils.isBlank(useId)){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
+ continue;
}
- else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyStart())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璐ㄤ繚寮�濮嬫棩鏈熺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ else if(StringUtils.isBlank(areaId)){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:宸ュ尯缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
+ continue;
}
- else if(StringUtils.isBlank(equipmentImportVo.getPropertyStatus())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勪骇鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ else if(StringUtils.isBlank(manageId)){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁存姢閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
+ continue;
}
- //闈炲繀濉」
-// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())){
+ else if(StringUtils.isBlank(equipmentCategoryName)){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍒嗙被缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ continue;
+ }
+ else if(StringUtils.isBlank(teamId)){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁翠慨鐝粍缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ continue;
+ }
+ //闈炲繀濉」
+ // else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyStart())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璐ㄤ繚寮�濮嬫棩鏈熺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getPropertyStatus())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勪骇鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍔熻兘浣嶇疆缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
-// else if(StringUtils.isBlank(equipmentImportVo.getLocation())){
+// else if(StringUtils.isBlank(equipmentImportVo.getLocation())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:瀹夎浣嶇疆缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
-// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
+// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
-// else if(StringUtils.isBlank(equipmentImportVo.getProjectApprovalNo())){
+// else if(StringUtils.isBlank(equipmentImportVo.getProjectApprovalNo())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:绔嬮」鍗″彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
-// else if(StringUtils.isBlank(equipmentImportVo.getFundSource())){
+// else if(StringUtils.isBlank(equipmentImportVo.getFundSource())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勯噾鏉ユ簮缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
-// else if(StringUtils.isBlank(equipmentImportVo.getAcceptanceCheckDate())){
+// else if(StringUtils.isBlank(equipmentImportVo.getAcceptanceCheckDate())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:楠屾敹鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
-// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
+// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
-// else if(StringUtils.isBlank(equipmentImportVo.getFactoryNo())){
+// else if(StringUtils.isBlank(equipmentImportVo.getFactoryNo())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶缂栧彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
-// else if( StringUtils.isBlank(equipmentImportVo.getConstructorId())){
+// else if( StringUtils.isBlank(equipmentImportVo.getConstructorId())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勪骇鍒堕�犲晢缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
- else if(StringUtils.isBlank(equipmentImportVo.getModel())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- }
- else if(StringUtils.isBlank(equipmentImportVo.getSpecification())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧瑙勬牸缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- }
+// else if(StringUtils.isBlank(equipmentImportVo.getSpecification())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧瑙勬牸缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
// else if(StringUtils.isBlank(equipmentImportVo.getGpo())){
// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍔熺巼缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
// exceptionNum++;
// }
- else if(ObjectUtils.isNull(equipmentCategory))
- {
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璇ヨ澶囨墍灞炵被鍒笉瀛樺湪锛岃鍏堢淮鎶よ澶囩被鍒�;";
- exceptionNum++;
- }
else{
- if(equipmentImportVo.getPropertyStatus().equals("warranty")){
+ SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()).eq("del_flag",0),false);
+ if(ObjectUtils.isNotNull(use)){
+ equipment.setUseId(use.getId());
+ }else {
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ浣跨敤閮ㄩ棬,璇风淮鎶ら儴闂ㄦ暟鎹悗鍐嶅鍏�;";
+ exceptionNum++;
+ continue;
+ }
+ Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()).eq("del_flag",0));
+ Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()).eq("del_flag",0));
+ if(ObjectUtils.isNotNull(area)){
+ equipment.setFactoryModelId(area.getId());
+ }else if(ObjectUtils.isNotNull(area1)) {
+ equipment.setFactoryModelId(area1.getId());
+ }else {
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ宸ュ尯,璇风淮鎶ゅ伐鍖烘暟鎹悗鍐嶅鍏�;";
+ exceptionNum++;
+ continue;
+ }
+ SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()).eq("del_flag",0));
+ if(ObjectUtils.isNotNull(manage)){
+ equipment.setManageId(manage.getId());
+ }else{
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ缁存姢閮ㄩ棬,璇峰厛缁存姢閮ㄩ棬鏁版嵁鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ continue;
+ }
+ EquipmentCategory equipmentCategory = equipmentCategoryService
+ .getOne(new QueryWrapper<EquipmentCategory>()
+ .eq("name",equipmentCategoryName.trim()).eq("del_flag",0),false);
+ if(ObjectUtils.isNotNull(equipmentCategory)){
+ equipment.setEquipmentCategoryId(equipmentCategory.getId());
+ }
+ else {
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ璁惧鍒嗙被,璇峰厛缁存姢璁惧鍒嗙被鏁版嵁鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ continue;
+ }
+ Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()).eq("del_flag",0),false);
+ Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()).eq("del_flag",0),false);
+ if(ObjectUtils.isNotNull(team)){
+ equipment.setTeamId(team.getId());
+ }else if(ObjectUtils.isNotNull(team1)) {
+ equipment.setTeamId(team1.getId());
+ }else {
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ鐝粍,璇峰厛缁存姢鐝粍鏁版嵁鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ continue;
+ }
+ if(StringUtils.isNotBlank(constructorId)){
+ Constructor constructor = constructorService.getByName(constructorId.trim());
+ if(ObjectUtils.isNotNull(constructor)){
+ equipment.setConstructorId(constructor.getId());
+ }else {
+ constructor = new Constructor();
+ constructor.setName(constructorId);
+ constructor.setDelFlag(0);
+ constructorService.save(constructor);
+ equipment.setConstructorId(constructor.getId());
+ }
+ }
+ if(StringUtils.isNotBlank(propertyStatus)&&propertyStatus.equals("warranty")){
if(
ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璇ヨ澶囧浜庤川淇濇湡锛岃川淇濅俊鎭己澶憋紝璇峰厛缁存姢璐ㄤ繚寮�濮嬫椂闂存垨缁撴潫鏃堕棿;";
exceptionNum++;
+ continue;
}
}else{
- Equipment oriEquipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentImportVo.getNum()),false);
+ Equipment oriEquipment = equipmentService
+ .getOne(new QueryWrapper<Equipment>()
+ .eq("num",equipmentImportVo.getNum()).eq("del_flag",0),false);
if(ObjectUtils.isNull(oriEquipment)){
- Equipment equipment = new Equipment();
equipment.setNum(equipmentImportVo.getNum())
.setName(equipmentImportVo.getName())
- .setUseId(equipmentImportVo.getUseId())
- .setEquipmentUda1(equipmentImportVo.getEquipmentUda1())
- .setManageId(equipmentImportVo.getManageId())
- .setTeamId(equipmentImportVo.getTeamId())
.setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
.setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
- .setEquipmentCategoryId(equipmentCategory.getId())
.setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
.setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
.setCoolingSystem(equipmentImportVo.getCoolingSystem())
.setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
.setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod())
- .setOperatingSystem(equipmentImportVo.getOperatingSystem())
.setSystem(equipmentImportVo.getSystem())
.setPort(equipmentImportVo.getPort())
.setCoordinateNum(equipmentImportVo.getCoordinateNum())
@@ -689,23 +782,50 @@
.setFundSource(equipmentImportVo.getFundSource())
.setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
.setFactoryNumber(equipmentImportVo.getFactoryNumber())
- .setConstructorId(equipmentImportVo.getConstructorId())
.setSourceCountry(equipmentImportVo.getSourceCountry())
.setModel(equipmentImportVo.getModel())
.setSpecification(equipmentImportVo.getSpecification())
- .setFactoryModelId(equipmentImportVo.getFactoryModelId())
- .setWorkCenterId(equipmentImportVo.getWorkCenterId())
.setPropertyStatus(equipmentImportVo.getPropertyStatus())
.setWarrantyStart(equipmentImportVo.getWarrantyStart())
.setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
+ .setIsLineEquip("no")
+ .setIsLine("no")
+ .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(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+"");
+ }
+ }
+ }
equipmentService.save(equipment);
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;";
exceptionNum++;
+ continue;
}
}
-
}
}
if(exceptionNum!=0){
@@ -727,6 +847,62 @@
}
return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
}
-
+ @GetMapping(value = "/getEquipmentStansdardList")
+ @PermissionData
+ public Result<IPage<DailyInspectionStandardDetail>> getEquipmentStansdardList(DailyInspectionStandardDetail standardDetail,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ 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(),standardDetail.getType());
+ return Result.OK(pageList);
+ }
+ @PostMapping("addLine")
+ @Transactional(rollbackFor = {Exception.class})
+ public Result<?> addLine(@RequestBody Equipment equipment){
+ equipment.setIsLineEquip("no");
+ equipment.setIsLine("yes");
+ equipmentService.save(equipment);
+ List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
+ for(Equipment equipment1:equipmentList){
+ equipment1.setId(equipment1.getShowId());
+ equipment1.setIsLineEquip("yes");
+ 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)
+ .set("is_line_equip","no"));
+ List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
+ for(Equipment equipment1:equipmentList){
+ equipment1.setLineId(equipment.getId());
+ String id = equipment1.getId();
+ if(StringUtils.isBlank(id)){
+ equipment1.setId(equipment1.getShowId());
+ }
+ equipment1.setIsLineEquip("yes");
+ }
+ equipmentService.updateBatchById(equipmentList);
+ return Result.OK("缂栬緫鎴愬姛");
+ }
+ @PostMapping("/updateKeyEquipment")
+ public Result<?>updateKeyEquipment(@RequestBody Equipment equipment){
+ equipmentService.update(new UpdateWrapper<Equipment>().eq("specific_equipment","0").set("specific_equipment",null));
+ List<Equipment> keyEquipmentUpdateList = equipment.getKeyEquipmentUpdateList();
+ for(Equipment updateEquipment:keyEquipmentUpdateList){
+ updateEquipment.setId(updateEquipment.getEquipmentId());
+ equipmentService.updateById(updateEquipment);
+ }
+ return Result.OK("淇敼鎴愬姛");
+ }
}
--
Gitblit v1.9.3