From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 660 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 632 insertions(+), 28 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 21b2970..79650b8 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
@@ -485,6 +485,13 @@
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CalibrationOrder> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrder, req.getParameterMap());
+ //鐘舵�佺瓫閫�
+ List<String> statusEnumList = null;
+ if(StringUtils.isNotBlank(calibrationOrder.getStatusEnums())) {
+ String[] statusEnums = calibrationOrder.getStatusEnums().split(",");
+ statusEnumList = Arrays.asList(statusEnums);
+ queryWrapper.notIn("status", statusEnumList);
+ }
Page<CalibrationOrder> page = new Page<CalibrationOrder>(pageNo, pageSize);
IPage<CalibrationOrder> pageList = calibrationOrderService.page(page, queryWrapper);
for (CalibrationOrder record : pageList.getRecords()) {
@@ -775,19 +782,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 +831,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 +870,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,19 +880,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.getThisMonthMaintenanceList(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.getThisMonthMaintenanceList("",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.getThisMonthMaintenanceList(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));
+ 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());
}
}
@@ -887,19 +929,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 +973,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 +1027,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);
@@ -983,7 +1139,455 @@
@GetMapping("getTwoMaintenancePlanList")
public Result<?> getTwoMaintenancePlanList(String productionCode) {
List<Map<String, Object>> twoMaintenancePlanList = calibrationOrderService.getTwoMaintenancePlanList(productionCode);
- return Result.ok();
+ 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 = calibrationOrderService.getAreaEquipmentList(equipmentNum,"",null);
+ for (Map<String, Object> map : list) {
+ String equipmentId = (String)map.get("id");
+ List<Map<String, Object>> counts = calibrationOrderService.getEquipmentReportRepairCount(equipmentId);
+ if(counts.size()>0){
+ map.put("repairCount",counts.get(0).get("repairCount"));
+ }else{
+ map.put("repairCount","0");
+ }
+ }
+ 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);
+ for (Map<String, Object> map : list) {
+ String equipmentId = (String)map.get("id");
+ List<Map<String, Object>> counts = calibrationOrderService.getEquipmentReportRepairCount(equipmentId);
+ if(counts.size()>0){
+ map.put("repairCount",counts.get(0).get("repairCount"));
+ }else{
+ map.put("repairCount","0");
+ }
+ }
+ }
+ }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);
+ for (Map<String, Object> map : list) {
+ String equipmentId = (String)map.get("id");
+ List<Map<String, Object>> counts = calibrationOrderService.getEquipmentReportRepairCount(equipmentId);
+ if(counts.size()>0){
+ map.put("repairCount",counts.get(0).get("repairCount"));
+ }else{
+ map.put("repairCount","0");
+ }
+ }
+ }
+ }
+ 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);
+ }
+
+
+ /**
+ *棣栭〉 鎶�鏈姸鎬佺偣鍑诲脊鍑哄搴旀槑缁�
+ * qsw 2024-5-23
+ */
+ @GetMapping("showEquipmentByTechnologyStatus")
+ public Result<?> getEquipmentByTechnologyStatus(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode,String technologyStatus) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, "", "", technologyStatus);
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, area.getId(), "", technologyStatus);
+ }
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, "", area.getId(), technologyStatus);
+ }
+ }
+ }
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, area.getId(), "", technologyStatus);
+ }
+ }else{
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, "", area.getId(), technologyStatus);
+ }
+ }
+ }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){
+ equipments = calibrationOrderService.getEquipmentByTechnologyStatus(pageNo, pageSize, "", area.getId(), technologyStatus);
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+
+ /**
+ *棣栭〉 璁惧鎶ヤ慨鎯呭喌缁熻鏄庣粏灞曠ず
+ * qsw 2024-5-25
+ */
+ @GetMapping("showEquipmentByReportRepair")
+ public Result<?> getEquipmentByReportRepair(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode,String isStop) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, "", "", isStop);
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, area.getId(), "", isStop);
+ }
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, "", area.getId(), isStop);
+ }
+ }
+ }
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, area.getId(), "", isStop);
+ }
+ }else{
+ Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
+ if(area != null){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, "", area.getId(), isStop);
+ }
+ }
+ }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){
+ equipments = calibrationOrderService.getEquipmentByReportRepair(pageNo, pageSize, "", area.getId(), isStop);
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ *棣栭〉鏈湀涓変繚璁″垝鏄庣粏
+ * qsw 2024-3-14
+ */
+ @GetMapping("showThisMonthMaintenanceList")
+ public Result<?> showThisMonthMaintenanceList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, "", "");
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, 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));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, "", 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));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, 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){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, "", 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){
+ equipments = calibrationOrderService.showThisMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝鏄庣粏灞曠ず
+ * qsw 2024-3-14
+ */
+ @GetMapping("showNextMonthMaintenanceList")
+ public Result<?> showNextMonthMaintenanceList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, "", "");
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, 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));
+ if(area != null){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, "", 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));
+ if(area != null){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, 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){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, "", 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){
+ equipments = calibrationOrderService.showNextMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒掓槑缁�
+ * qsw 2024-3-14
+ */
+ @GetMapping("showNextNextMonthMaintenanceList")
+ public Result<?> showNextNextMonthMaintenanceList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+// List<Map<String, Object>> list = null;
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, "", "");
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, 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));
+ if(area != null){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, "", 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));
+ if(area != null){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, 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){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, "", 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){
+ equipments = calibrationOrderService.showNextNextMonthMaintenanceList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚璁惧鏄庣粏
+ * qsw 2024-3-14
+ */
+ @GetMapping("showThisMonthMaintenanceFinishList")
+ public Result<?> showThisMonthMaintenanceFinishList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = null;
+ if(USER_TYPE_4.equals(userType)){
+ if(StringUtils.isBlank(productionCode)){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, "", "");
+ }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));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, 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));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, "", 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));
+ if(area != null){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, 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){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, "", 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){
+ equipments = calibrationOrderService.showThisMonthMaintenanceFinishList(pageNo, pageSize, "", area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ * 宸ユ绾� 涓変繚寤舵湡鏁伴噺鏄庣粏
+ * qsw 2024-3-20
+ */
+ @GetMapping("show3MaintenancePostponeList")
+ public Result<?> show3MaintenancePostponeList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = 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){
+ equipments = calibrationOrderService.show3MaintenancePostponeCount(pageNo, pageSize,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){
+ equipments = calibrationOrderService.show3MaintenancePostponeCount(pageNo, pageSize,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){
+ equipments = calibrationOrderService.show3MaintenancePostponeCount(pageNo, pageSize,area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+ /**
+ * 宸ユ绾� 涓変繚瓒呮湡鏁伴噺鏄庣粏
+ * qsw 2024-3-20
+ */
+ @GetMapping("show3MaintenanceOverdueList")
+ public Result<?> show3MaintenanceOverdueList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,String productionCode) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Integer userType = user.getUserType();
+ IPage<Map<String, Object>> equipments = 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){
+ equipments = calibrationOrderService.show3MaintenanceOverdueCount(pageNo, pageSize, 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){
+ equipments = calibrationOrderService.show3MaintenanceOverdueCount(pageNo, pageSize, 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){
+ equipments = calibrationOrderService.show3MaintenanceOverdueCount(pageNo, pageSize, area.getId());
+ }
+ }
+ return Result.ok(equipments);
+ }
+
+
+
+
}
--
Gitblit v1.9.3