From f2e8dc200f4ec9c1021e908f65e6e1e458c2ef70 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期三, 25 十月 2023 13:19:39 +0800
Subject: [PATCH] 鉴定工单调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 107 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 73 insertions(+), 34 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 6eb37cb..b1824b6 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
@@ -12,6 +12,7 @@
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;
@@ -61,10 +62,10 @@
@Autowired
private IProcessParametersTemplateDetailService processParametersTemplateDetailService;
- @Autowired
+ @Autowired
private IEquipmentProcessParametersService equipmentProcessParametersService;
- @Autowired
+ @Autowired
private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;
@Autowired
@@ -179,16 +180,16 @@
* 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
* 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);
}
@@ -467,34 +468,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);
}
@@ -522,7 +523,8 @@
queryWrapper.in("equipment_status",statusList);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
- }/**
+ }
+ /**
* 瀵煎叆
* @return
*/
@@ -704,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)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;";
@@ -733,6 +761,17 @@
}
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());
+ return Result.OK(pageList);
+ }
}
--
Gitblit v1.9.3