From f11a932fd83e13cd8d7726e053181bc40f3a3240 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 16:00:24 +0800
Subject: [PATCH] 参数修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 247 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 220 insertions(+), 27 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 4b5836c..ce24a6a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -25,6 +25,9 @@
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.CalibrationOrderPage;
+import org.jeecg.modules.eam.vo.SysFileNameVo;
+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.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -70,12 +73,24 @@
@Autowired
private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
+
+ @Autowired
+ private ITechnologyStatusService technologyStatusService;
+
+ @Autowired
+ private ISysFileNameService sysFileNameService;
+
+ @Autowired
+ private ISysDepartService sysDepartService;
// @Autowired
// private IUploadRelaService uploadRelaService;
// @Autowired
// private IUploadService uploadService;
private ISysBaseAPI sysBaseApi;
+
+ @Autowired
+ private IAreaService areaService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -458,37 +473,41 @@
String managementMode = record.getManagementMode();
String equipmentId = record.getEquipmentId();
Equipment equipment = equipmentService.getById(equipmentId);
+ String useId = equipment.getUseId();
+ SysDepart depart = sysDepartService.getById(useId);
if(equipment != null){
record.setEquipmentNum(equipment.getNum());
record.setEquipmentName(equipment.getName());
record.setEquipmentModel(equipment.getModel());
record.setEquipmentSpecification(equipment.getSpecification());
+ record.setEquipmentImportance(equipment.getEquipmentImportanceId());
+ record.setUseDepartName(ObjectUtils.isNotNull(depart)?depart.getDepartName():"");
}
- List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
- record.setPrecisionParameterList(precisionParameterList);
- 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.setCalibrationResult("寮傚父");
- }else{
- record.setCalibrationResult("姝ｅ父");
- }
- }else{
- List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
- .eq(CalibrationOrderReport::getCalibrationOrderId, id)
- .eq(CalibrationOrderReport::getJudgmentResult, "fail")
- .eq(CalibrationOrderReport::getDelFlag, "0").list();
- if(calibrationOrderReports.size()>0){
- record.setCalibrationResult("寮傚父");
- }else{
- record.setCalibrationResult("姝ｅ父");
- }
- }
- }
+// List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
+// record.setPrecisionParameterList(precisionParameterList);
+// 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.setCalibrationResult("寮傚父");
+// }else{
+// record.setCalibrationResult("姝ｅ父");
+// }
+// }else{
+// List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
+// .eq(CalibrationOrderReport::getCalibrationOrderId, id)
+// .eq(CalibrationOrderReport::getJudgmentResult, "fail")
+// .eq(CalibrationOrderReport::getDelFlag, "0").list();
+// if(calibrationOrderReports.size()>0){
+// record.setCalibrationResult("寮傚父");
+// }else{
+// record.setCalibrationResult("姝ｅ父");
+// }
+// }
+// }
}
return Result.OK(pageList);
}
@@ -503,7 +522,7 @@
for (CalibrationOrderDetail calibrationOrderDetail : calibrationOrderDetails) {
calibrationOrderDetailService.removeById(calibrationOrderDetail);
}
- addAndEdit(calibrationOrder);
+// addAndEdit(calibrationOrder);
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -532,8 +551,24 @@
public Result<String> addNew(@RequestBody CalibrationOrder calibrationOrder) {
calibrationOrder.setStatus("1");
calibrationOrderService.save(calibrationOrder);
- addAndEdit(calibrationOrder);
+
+ String equipmentId = calibrationOrder.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ String equipmentImportance = equipment.getEquipmentImportanceId();
+ if("D".equals(equipmentImportance)){
+ this.createTechnologyStatus(calibrationOrder);
+ }
+
+// addAndEdit(calibrationOrder);
return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ void createTechnologyStatus(CalibrationOrder calibrationOrder){
+ List<SysFileNameVo> sysFileName = sysFileNameService.getSysFileName("9");
+ TechnologyStatus technologyStatus = new TechnologyStatus();
+ technologyStatus.setOrderId(calibrationOrder.getId());
+ technologyStatus.setReceipts(sysFileName.get(0).getReceipts());
+ technologyStatusService.save(technologyStatus);
}
/**
@@ -639,4 +674,162 @@
calibrationOrderService.updateById(calibrationOrder);
return Result.OK("缂栬緫鎴愬姛!");
}
+
+ /**
+ *棣栭〉鍏徃绾� 鎶�鏈姸鎬佹暟閲忕粺璁�
+ * qsw 2024-3-13
+ */
+ @GetMapping("getFactoryEquipmentTechnologyStatusList")
+ public Result<?> getFactoryEquipmentTechnologyStatusList() {
+ List<Map<String, Object>> list = calibrationOrderService.getFactoryEquipmentTechnologyStatusList();
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉鍏徃绾� 璁惧鎶ヤ慨鎯呭喌缁熻
+ * qsw 2024-3-13
+ */
+ @GetMapping("getFactoryReportRepairEquipmentList")
+ public Result<?> getFactoryReportRepairEquipmentList() {
+ List<Map<String, Object>> list = calibrationOrderService.getFactoryReportRepairEquipmentList();
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉鍏徃绾� 鏈湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @GetMapping("getFactoryThisMonthMaintenanceList")
+ public Result<?> getFactoryThisMonthMaintenanceList() {
+ List<Map<String, Object>> list = calibrationOrderService.getFactoryThisMonthMaintenanceList();
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉鍏徃绾� 涓嬫湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @GetMapping("getFactoryNextMonthMaintenanceList")
+ public Result<?> getFactoryNextMonthMaintenanceList() {
+ List<Map<String, Object>> list = calibrationOrderService.getFactoryNextMonthMaintenanceList();
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉鍏徃绾� 鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ @GetMapping("getFactoryThisMonthMaintenanceFinishList")
+ public Result<?> getFactoryThisMonthMaintenanceFinishList() {
+ List<Map<String, Object>> list = calibrationOrderService.getFactoryThisMonthMaintenanceFinishList();
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉鍏徃绾� 涓嬩笅鏈堜笁淇濊鍒�
+ * qsw 2024-3-14
+ */
+ @GetMapping("getFactoryNextNextMonthMaintenanceList")
+ public Result<?> getFactoryNextNextMonthMaintenanceList() {
+ List<Map<String, Object>> list = calibrationOrderService.getFactoryNextNextMonthMaintenanceList();
+ return Result.ok(list);
+ }
+
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鎶�鏈姸鎬佹暟閲忕粺璁�
+ * qsw 2024-3-13
+ */
+ @GetMapping("getEquipmentTechnologyStatusList")
+ public Result<?> getEquipmentTechnologyStatusList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getEquipmentTechnologyStatusList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
+ * qsw 2024-3-13
+ */
+ @GetMapping("getReportRepairEquipmentList")
+ public Result<?> getReportRepairEquipmentList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getReportRepairEquipmentList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @GetMapping("getThisMonthMaintenanceList")
+ public Result<?> getThisMonthMaintenanceList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getThisMonthMaintenanceList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @GetMapping("getNextMonthMaintenanceList")
+ public Result<?> getNextMonthMaintenanceList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getNextMonthMaintenanceList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒�
+ * qsw 2024-3-14
+ */
+ @GetMapping("getNextNextMonthMaintenanceList")
+ public Result<?> getNextNextMonthMaintenanceList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getNextNextMonthMaintenanceList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ @GetMapping("getThisMonthMaintenanceFinishList")
+ public Result<?> getThisMonthMaintenanceFinishList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getThisMonthMaintenanceFinishList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
}
--
Gitblit v1.9.3