From 63a5530a85e6eaf7f8be733e87d32af2d16477a8 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 07 四月 2024 13:39:02 +0800
Subject: [PATCH] 设备管理 报表打印修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 274 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 219 insertions(+), 55 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index 59367c1..51bfc63 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -83,6 +83,14 @@
@Lazy
private IdentityService sysIdentityService;
+ @Autowired
+ @Lazy
+ private IEamEquipmentService equipmentService;
+
+ @Autowired
+ @Lazy
+ private IDailyInspectionStandardService dailyInspectionStandardService;
+
// @Autowired
// private IUploadRelaService uploadRelaService;
//
@@ -124,32 +132,32 @@
List<Map<String, Object>> records = inspectionOrderList.getRecords();
for (Map<String, Object> record : records) {
String id = (String)record.get("id");
- String equipmentId = (String)record.get("equipmentId");
- String status = (String)record.get("status");
- String inspectionStandardId = (String)record.get("inspectionStandardId");
- List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId);
- record.put("inspectionCycles",inspectionCycles);
+// String equipmentId = (String)record.get("equipmentId");
+// String status = (String)record.get("status");
+// String inspectionStandardId = (String)record.get("inspectionStandardId");
+// List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId);
+// record.put("inspectionCycles",inspectionCycles);
List<Map<String, Object>> inspectionOrderDetails = inspectionOrderService.getInspectionOrderDetailByOrderId(id);
record.put("inspectionOrderDetails",inspectionOrderDetails);
- List<InspectionOrderDetail> failCount = inspectionOrderDetailService.lambdaQuery()
- .eq(InspectionOrderDetail::getInspectionOrderId, id)
- .eq(InspectionOrderDetail::getJudgmentResult, "fail")
- .eq(InspectionOrderDetail::getDelFlag, 0).list();
+// List<InspectionOrderDetail> failCount = inspectionOrderDetailService.lambdaQuery()
+// .eq(InspectionOrderDetail::getInspectionOrderId, id)
+// .eq(InspectionOrderDetail::getJudgmentResult, "fail")
+// .eq(InspectionOrderDetail::getDelFlag, 0).list();
+//
+// List<InspectionOrderDetail> passCount = inspectionOrderDetailService.lambdaQuery()
+// .eq(InspectionOrderDetail::getInspectionOrderId, id)
+// .eq(InspectionOrderDetail::getJudgmentResult,"pass")
+// .eq(InspectionOrderDetail::getDelFlag, 0).list();
+// record.put("result","姝ｅ父:"+passCount.size()+"锛�"+"寮傚父:"+failCount.size());
- List<InspectionOrderDetail> passCount = inspectionOrderDetailService.lambdaQuery()
- .eq(InspectionOrderDetail::getInspectionOrderId, id)
- .eq(InspectionOrderDetail::getJudgmentResult,"pass")
- .eq(InspectionOrderDetail::getDelFlag, 0).list();
- record.put("result","姝ｅ父:"+passCount.size()+"锛�"+"寮傚父:"+failCount.size());
-
- if("5".equals(status) ){
- record.put("distable",true);
- }else{
- record.put("distable",false);
- }
+// if("5".equals(status) ){
+// record.put("distable",true);
+// }else{
+// record.put("distable",false);
+// }
}
return Result.ok(inspectionOrderList);
}
@@ -179,30 +187,65 @@
}
inspectionOrder.setInspectionDeadline(date);
inspectionOrder.setInspectionStandardType("1");
+ inspectionOrder.setStatus("3");//3:鏈紑濮�
inspectionOrderService.save(inspectionOrder);
- List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
- for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
- String id = inspectionOrder.getId();
- String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
- String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
- DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
- InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ String equipmentId = inspectionOrder.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ String isLineEquip = equipment.getIsLineEquip();
+ if("no".equals(isLineEquip)){
+ List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
+ for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
+ String id = inspectionOrder.getId();
+ String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
+ String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
- inspectionOrderDetail.setId("");
- inspectionOrderDetail.setInspectionOrderId(id);
- inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
- inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
- inspectionOrderDetail.setInspectionMethod(inspectionProject.getInspectionMethod());
- inspectionOrderDetail.setInspectionTool(inspectionProject.getInspectionTool());
- inspectionOrderDetail.setAnalysisMethod(inspectionProject.getAnalysisMethod());
- inspectionOrderDetail.setTestValueType(inspectionProject.getTestValueType());
- inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
- inspectionOrderDetail.setAcceptabilityLimit(inspectionProject.getAcceptabilityLimit());
+ DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
- inspectionOrderDetailService.save(inspectionOrderDetail);
+ inspectionOrderDetail.setId("");
+ inspectionOrderDetail.setInspectionOrderId(id);
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
+ inspectionOrderDetail.setInspectionMethod(inspectionProject.getInspectionMethod());
+ inspectionOrderDetail.setInspectionTool(inspectionProject.getInspectionTool());
+ inspectionOrderDetail.setAnalysisMethod(inspectionProject.getAnalysisMethod());
+ inspectionOrderDetail.setTestValueType(inspectionProject.getTestValueType());
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ inspectionOrderDetail.setAcceptabilityLimit(inspectionProject.getAcceptabilityLimit());
+
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }else{
+ String lineId = equipment.getLineId();
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getEquipmentId, lineId)
+ .eq(DailyInspectionStandard::getVersionStatus, "2")
+ .eq(DailyInspectionStandard::getDelFlag, "0").list();
+ if(dailyInspectionStandards.size()>0) {
+ DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0);
+ //淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
+ List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()
+ .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,dailyInspectionStandard.getId())
+ .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId())
+ .eq(DailyInspectionStandardDetail::getDelFlag,"0").list();
+ for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
+ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId();
+
+ InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail();
+ inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId());
+ inspectionOrderDetail.setInspectionProjectId(inspectionProjectId);
+ inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId());
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ if(inspectionProject != null){
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ }
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }
}
-
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -242,25 +285,59 @@
inspectionOrderDetailService.updateById(inspectionOrderDetail);
}
- List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
- for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
- String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
- String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
+ String equipmentId = inspectionOrder.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ String isLineEquip = equipment.getIsLineEquip();
+ if("no".equals(isLineEquip)){
+ List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
+ for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
+ String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
+ String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
- DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
- InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
- inspectionOrderDetail.setId("");
- inspectionOrderDetail.setInspectionOrderId(id);
- inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
- inspectionOrderDetail.setInspectionMethod(inspectionProject.getInspectionMethod());
- inspectionOrderDetail.setInspectionTool(inspectionProject.getInspectionTool());
- inspectionOrderDetail.setAnalysisMethod(inspectionProject.getAnalysisMethod());
- inspectionOrderDetail.setTestValueType(inspectionProject.getTestValueType());
- inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
- inspectionOrderDetail.setAcceptabilityLimit(inspectionProject.getAcceptabilityLimit());
+ inspectionOrderDetail.setId("");
+ inspectionOrderDetail.setInspectionOrderId(id);
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setInspectionMethod(inspectionProject.getInspectionMethod());
+ inspectionOrderDetail.setInspectionTool(inspectionProject.getInspectionTool());
+ inspectionOrderDetail.setAnalysisMethod(inspectionProject.getAnalysisMethod());
+ inspectionOrderDetail.setTestValueType(inspectionProject.getTestValueType());
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ inspectionOrderDetail.setAcceptabilityLimit(inspectionProject.getAcceptabilityLimit());
- inspectionOrderDetailService.save(inspectionOrderDetail);
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }else{
+ String lineId = equipment.getLineId();
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getEquipmentId, lineId)
+ .eq(DailyInspectionStandard::getVersionStatus, "2")
+ .eq(DailyInspectionStandard::getDelFlag, "0").list();
+ if(dailyInspectionStandards.size()>0) {
+ DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0);
+ //淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
+ List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()
+ .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,dailyInspectionStandard.getId())
+ .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId())
+ .eq(DailyInspectionStandardDetail::getDelFlag,"0").list();
+ for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
+ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId();
+
+ InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail();
+ inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId());
+ inspectionOrderDetail.setInspectionProjectId(inspectionProjectId);
+ inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId());
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ if(inspectionProject != null){
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ }
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }
}
}
String inspectionUserId = inspectionOrder.getInspectionUserId();
@@ -479,6 +556,7 @@
equipmentReportRepair.setNum(num);
equipmentReportRepair.setStatus("1");
equipmentReportRepair.setSource("2");
+ equipmentReportRepair.setType("2");//绫诲瀷锛�1琚姩鎶ヤ慨锛�2涓诲姩鎶ヤ慨锛�
equipmentReportRepair.setIsCreateOrder(0);
equipmentReportRepair.setEquipmentId(inspectionOrder.getEquipmentId());
equipmentReportRepair.setFaultDescription(orderDetail.getAbnormalDesc());
@@ -492,6 +570,7 @@
}
}
inspectionOrder.setActualEndTime(new Date());
+ inspectionOrder.setInspectionOrderUda2(sysUser.getRealname());
boolean b = inspectionOrderService.updateById(inspectionOrder);
if (!b) {
return Result.error("鎶ュ伐澶辫触!");
@@ -520,4 +599,89 @@
}
}
+
+ /**
+ *鐢熶骇璁惧鑷富缁存姢鐐规琛� 鎶ヨ〃
+ * 2024-3-27 qsw
+ */
+ @GetMapping("findInspectionProjectList")
+ public Result<?> findInspectionProjectList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> dayInspectionProjectList = inspectionOrderService.findDayInspectionProjectList(pageNo, 1000, params);
+ List<Map<String, Object>> records = dayInspectionProjectList.getRecords();
+ List<Map<String, Object>> maps = new ArrayList<>();
+ for (Map<String, Object> record : records) {
+ if(maps.size()>0){
+ Boolean flag = false;
+ for (Map<String, Object> map : maps) {
+ if(map.containsValue(record.get("name")) && map.containsValue(record.get("detectionStandard"))){
+ map.put(record.get("createTime").toString(),record.get("insResult"));
+ flag = true;
+ }
+ }
+ if(flag == false){
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",record.get("name"));
+ hashMap.put("equipmentNum",record.get("equipmentNum"));
+ hashMap.put("equipmentName",record.get("equipmentName"));
+ hashMap.put("detectionStandard",record.get("detectionStandard"));
+ hashMap.put(record.get("createTime").toString(),record.get("insResult"));
+ maps.add(hashMap);
+ }
+ }else{
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",record.get("name"));
+ hashMap.put("equipmentNum",record.get("equipmentNum"));
+ hashMap.put("equipmentName",record.get("equipmentName"));
+ hashMap.put("detectionStandard",record.get("detectionStandard"));
+ hashMap.put(record.get("createTime").toString(),record.get("insResult"));
+ maps.add(hashMap);
+ }
+ }
+ return Result.ok(maps);
+ }
+
+ /**
+ *鐢熶骇璁惧鑷富缁存姢鍛ㄧ偣妫�琛� 鎶ヨ〃
+ * 2024-3-27 qsw
+ */
+ @GetMapping("findWeekInspectionProjectList")
+ public Result<?> findWeekInspectionProjectList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> dayInspectionProjectList = inspectionOrderService.findWeekInspectionProjectList(pageNo, 1000, params);
+ List<Map<String, Object>> records = dayInspectionProjectList.getRecords();
+ List<Map<String, Object>> maps = new ArrayList<>();
+ for (Map<String, Object> record : records) {
+ if(maps.size()>0){
+ Boolean flag = false;
+ for (Map<String, Object> map : maps) {
+ if(map.containsValue(record.get("name")) && map.containsValue(record.get("detectionStandard"))){
+ map.put(record.get("createTime").toString(),record.get("insResult"));
+ flag = true;
+ }
+ }
+ if(flag == false){
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",record.get("name"));
+ hashMap.put("equipmentNum",record.get("equipmentNum"));
+ hashMap.put("equipmentName",record.get("equipmentName"));
+ hashMap.put("detectionStandard",record.get("detectionStandard"));
+ hashMap.put(record.get("createTime").toString(),record.get("insResult"));
+ maps.add(hashMap);
+ }
+ }else{
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",record.get("name"));
+ hashMap.put("equipmentNum",record.get("equipmentNum"));
+ hashMap.put("equipmentName",record.get("equipmentName"));
+ hashMap.put("detectionStandard",record.get("detectionStandard"));
+ hashMap.put(record.get("createTime").toString(),record.get("insResult"));
+ maps.add(hashMap);
+ }
+ }
+ return Result.ok(maps);
+ }
+
}
--
Gitblit v1.9.3