From a862e80c1ee46a77fc8a2dacf59b0110b3669550 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 22 四月 2024 16:32:02 +0800
Subject: [PATCH] 参数修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 262 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 231 insertions(+), 31 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 812878a..ca175e5 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
@@ -775,19 +775,33 @@
String orgType = calibrationOrderService.findOrgType(productionCode);
if(ORG_TYPE_2.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getEquipmentTechnologyStatusList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getEquipmentTechnologyStatusList(area.getId(),"");
+ }
}else if(ORG_TYPE_3.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getEquipmentTechnologyStatusList("",area.getId());
+ if(area != null){
+ list = calibrationOrderService.getEquipmentTechnologyStatusList("",area.getId());
+ }
}
}
}else if(USER_TYPE_3.equals(userType)){
String code = calibrationOrderService.findProductionCode(user.getId());
if(StringUtils.isBlank(productionCode)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getEquipmentTechnologyStatusList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getEquipmentTechnologyStatusList(area.getId(),"");
+ }
}else{
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.getEquipmentTechnologyStatusList("",area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
list = calibrationOrderService.getEquipmentTechnologyStatusList("",area.getId());
}
}
@@ -810,19 +824,33 @@
String orgType = calibrationOrderService.findOrgType(productionCode);
if(ORG_TYPE_2.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
+ }
}else if(ORG_TYPE_3.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
+ if(area != null){
+ list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
+ }
}
}
}else if(USER_TYPE_3.equals(userType)){
String code = calibrationOrderService.findProductionCode(user.getId());
if(StringUtils.isBlank(productionCode)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
+ }
}else{
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
}
}
@@ -835,13 +863,6 @@
*/
@GetMapping("getThisMonthMaintenanceList")
public Result<?> getThisMonthMaintenanceList(String productionCode) {
-// 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;
-// }
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
Integer userType = user.getUserType();
List<Map<String, Object>> list = null;
@@ -852,20 +873,34 @@
String orgType = calibrationOrderService.findOrgType(productionCode);
if(ORG_TYPE_2.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getThisMonthMaintenanceList(area.getId(),"");
+ }
}else if(ORG_TYPE_3.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
+ if(area != null){
+ list = calibrationOrderService.getThisMonthMaintenanceList("",area.getId());
+ }
}
}
}else if(USER_TYPE_3.equals(userType)){
String code = calibrationOrderService.findProductionCode(user.getId());
if(StringUtils.isBlank(productionCode)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getThisMonthMaintenanceList(area.getId(),"");
+ }
}else{
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
+ if(area != null){
+ list = calibrationOrderService.getThisMonthMaintenanceList("",area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.getThisMonthMaintenanceList("",area.getId());
}
}
return Result.ok(list);
@@ -887,19 +922,33 @@
String orgType = calibrationOrderService.findOrgType(productionCode);
if(ORG_TYPE_2.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getNextMonthMaintenanceList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getNextMonthMaintenanceList(area.getId(),"");
+ }
}else if(ORG_TYPE_3.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getNextMonthMaintenanceList("",area.getId());
+ if(area != null){
+ list = calibrationOrderService.getNextMonthMaintenanceList("",area.getId());
+ }
}
}
}else if(USER_TYPE_3.equals(userType)){
String code = calibrationOrderService.findProductionCode(user.getId());
if(StringUtils.isBlank(productionCode)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getNextMonthMaintenanceList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getNextMonthMaintenanceList(area.getId(),"");
+ }
}else{
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.getNextMonthMaintenanceList("",area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
list = calibrationOrderService.getNextMonthMaintenanceList("",area.getId());
}
}
@@ -917,25 +966,39 @@
List<Map<String, Object>> list = null;
if(USER_TYPE_4.equals(userType)){
if(StringUtils.isBlank(productionCode)){
- list = calibrationOrderService.getFactoryNextMonthMaintenanceList();
+ list = calibrationOrderService.getFactoryNextNextMonthMaintenanceList();
}else{
String orgType = calibrationOrderService.findOrgType(productionCode);
if(ORG_TYPE_2.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getNextMonthMaintenanceList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getNextNextMonthMaintenanceList(area.getId(),"");
+ }
}else if(ORG_TYPE_3.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getNextMonthMaintenanceList("",area.getId());
+ if(area != null){
+ list = calibrationOrderService.getNextNextMonthMaintenanceList("",area.getId());
+ }
}
}
}else if(USER_TYPE_3.equals(userType)){
String code = calibrationOrderService.findProductionCode(user.getId());
if(StringUtils.isBlank(productionCode)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getNextMonthMaintenanceList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getNextNextMonthMaintenanceList(area.getId(),"");
+ }
}else{
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getNextMonthMaintenanceList("",area.getId());
+ if(area != null){
+ list = calibrationOrderService.getNextNextMonthMaintenanceList("",area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.getNextNextMonthMaintenanceList("",area.getId());
}
}
return Result.ok(list);
@@ -957,20 +1020,106 @@
String orgType = calibrationOrderService.findOrgType(productionCode);
if(ORG_TYPE_2.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getThisMonthMaintenanceFinishList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getThisMonthMaintenanceFinishList(area.getId(),"");
+ }
}else if(ORG_TYPE_3.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getThisMonthMaintenanceFinishList("",area.getId());
+ if(area != null){
+ list = calibrationOrderService.getThisMonthMaintenanceFinishList("",area.getId());
+ }
}
}
}else if(USER_TYPE_3.equals(userType)){
String code = calibrationOrderService.findProductionCode(user.getId());
if(StringUtils.isBlank(productionCode)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getThisMonthMaintenanceFinishList(area.getId(),"");
+ if(area != null){
+ list = calibrationOrderService.getThisMonthMaintenanceFinishList(area.getId(),"");
+ }
}else{
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.getThisMonthMaintenanceFinishList("",area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
list = calibrationOrderService.getThisMonthMaintenanceFinishList("",area.getId());
+ }
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ * 宸ユ绾� 涓変繚寤舵湡鏁伴噺
+ * qsw 2024-3-20
+ */
+ @GetMapping("get3MaintenancePostponeCount")
+ public Result<?> get3MaintenancePostponeCount(String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ List<Map<String, Object>> list = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isNotBlank(productionCode)){
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.get3MaintenancePostponeCount(area.getId());
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ if(StringUtils.isNotBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.get3MaintenancePostponeCount(area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.get3MaintenancePostponeCount(area.getId());
+ }
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ * 宸ユ绾� 涓変繚瓒呮湡鏁伴噺
+ * qsw 2024-3-20
+ */
+ @GetMapping("get3MaintenanceOverdueCount")
+ public Result<?> get3MaintenanceOverdueCount(String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ List<Map<String, Object>> list = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isNotBlank(productionCode)){
+ String orgType = calibrationOrderService.findOrgType(productionCode);
+ if(ORG_TYPE_3.equals(orgType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.get3MaintenanceOverdueCount(area.getId());
+ }
+ }
+ }
+ }else if(USER_TYPE_3.equals(userType)){
+ if(StringUtils.isNotBlank(productionCode)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.get3MaintenanceOverdueCount(area.getId());
+ }
+ }
+ }else if(USER_TYPE_2.equals(userType)){
+ String areaProductionCode = calibrationOrderService.findAreaProductionCode(user.getId());
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, areaProductionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.get3MaintenanceOverdueCount(area.getId());
}
}
return Result.ok(list);
@@ -981,9 +1130,60 @@
* qsw 2024-3-15
*/
@GetMapping("getTwoMaintenancePlanList")
- public Result<?> getTwoMaintenancePlanList() {
- List<Map<String, Object>> twoMaintenancePlanList = calibrationOrderService.getTwoMaintenancePlanList();
- return Result.ok();
+ public Result<?> getTwoMaintenancePlanList(String productionCode) {
+ List<Map<String, Object>> twoMaintenancePlanList = calibrationOrderService.getTwoMaintenancePlanList(productionCode);
+ return Result.ok(twoMaintenancePlanList);
+ }
+
+ /**
+ *棣栭〉 绗洓绾� 瀵瑰簲宸ュ尯涓嬶紝璁惧鍙拌处淇℃伅灞曠ず锛�
+ * qsw 2024-4-22
+ */
+ @GetMapping("getAreaEquipmentList")
+ public Result<?> getAreaEquipmentList(String equipmentNum) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ List<Map<String, Object>> list = null;
+ if(!USER_TYPE_1.equals(userType)){
+ list = calibrationOrderService.getAreaEquipmentList(equipmentNum,"",null);
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉 绗洓绾� 瀵瑰簲宸ュ尯涓嬶紝鎵�鏈夎澶囧彴璐︿俊鎭睍绀猴紱
+ * qsw 2024-4-22
+ */
+ @GetMapping("getAllAreaEquipmentList")
+ public Result<?> getAllAreaEquipmentList(String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ List<Map<String, Object>> list = null;
+ if(!USER_TYPE_1.equals(userType)){
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ list = calibrationOrderService.getAreaEquipmentList("",area.getId(),null);
+ }
+ }else{
+ List<Map<String, Object>> operationCertificatelist = calibrationOrderService.getOperationCertificate(user.getUsername());
+ if(operationCertificatelist.size()>0){
+ String equipmentIds = (String)operationCertificatelist.get(0).get("equipmentIds");
+ List<String> strings = Arrays.asList(equipmentIds.split(","));
+ list = calibrationOrderService.getAreaEquipmentList("","",strings);
+ }
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉 绗洓绾� 瀵瑰簲宸ュ尯涓嬶紝鎵�鏈夎澶囧彴璐︿俊鎭睍绀猴紱
+ * qsw 2024-4-22
+ */
+ @GetMapping("getOperationCertificate")
+ public Result<?> getOperationCertificate() {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ List<Map<String, Object>> list = calibrationOrderService.getOperationCertificate(user.getUsername());
+ return Result.ok(list);
}
}
--
Gitblit v1.9.3