|
|
@@ -347,6 +347,7 @@ public class WorkOrderBaseController extends BaseController {
|
|
347
|
347
|
}
|
|
348
|
348
|
}
|
|
349
|
349
|
var table = workorderbaseService.getList(qw);
|
|
|
350
|
+ List< Map<String,String>> orderProblems= workorderbaseService.selectOrderProblem();
|
|
350
|
351
|
List<DictData> dictDatas= dictDataService.getList();
|
|
351
|
352
|
List<WorkOrderBaseView> View= JSON.parseArray(JSON.toJSONString(table),WorkOrderBaseView.class);
|
|
352
|
353
|
List<WorkOrderType> typelist=workrodertypeService.getList();
|
|
|
@@ -373,14 +374,36 @@ List<WorkOrderType> typelist=workrodertypeService.getList();
|
|
373
|
374
|
|
|
374
|
375
|
}
|
|
375
|
376
|
//根据工单编号找orderproblem
|
|
376
|
|
- LambdaQueryWrapper<OrderProblem> orderproblemqw = new LambdaQueryWrapper();
|
|
377
|
|
- orderproblemqw.eq(OrderProblem::getWorkordercode,orderBase.getWorkordercode()).eq(OrderProblem::getIsDelete,0L);
|
|
378
|
|
- List<OrderProblem> problemslist= orderProblemService.getList(orderproblemqw);
|
|
379
|
|
- orderBase.setOrderProblems( orderProblemService.getList(orderproblemqw));
|
|
380
|
377
|
|
|
381
|
|
- orderBase.setStrOrderProblems( problemslist.stream()
|
|
382
|
|
- .map(problem -> problem.getAllName() + "-患病" + problem.getYears()+'年')
|
|
383
|
|
- .collect(Collectors.joining(",")));
|
|
|
378
|
+ var tt= orderProblems.stream()
|
|
|
379
|
+ .filter(map -> orderBase.getWorkordercode() .equals(map.get("key"))).collect(Collectors.toList());
|
|
|
380
|
+
|
|
|
381
|
+
|
|
|
382
|
+ String value = orderProblems.stream()
|
|
|
383
|
+ .filter(map -> orderBase.getWorkordercode() .equals(map.get("key")))
|
|
|
384
|
+ .map(map -> map.get("value"))
|
|
|
385
|
+ .filter(Objects::nonNull)
|
|
|
386
|
+ .findFirst()
|
|
|
387
|
+ .orElse(""); // 如果找不到返回 null,可以替换为默认值
|
|
|
388
|
+ orderBase.setStrOrderProblems(value);
|
|
|
389
|
+
|
|
|
390
|
+ // List<OrderProblem> problemslist= orderProblems.stream().filter(x->x.getWorkordercode()==orderBase.getWorkordercode()).collect(Collectors.toList());
|
|
|
391
|
+
|
|
|
392
|
+// LambdaQueryWrapper<OrderProblem> orderproblemqw = new LambdaQueryWrapper();
|
|
|
393
|
+// orderproblemqw.eq(OrderProblem::getWorkordercode,orderBase.getWorkordercode()).eq(OrderProblem::getIsDelete,0L);
|
|
|
394
|
+// List<OrderProblem> problemslist= orderProblemService.getList(orderproblemqw);
|
|
|
395
|
+
|
|
|
396
|
+// if(problemslist!=null && problemslist.size()>0){
|
|
|
397
|
+// orderBase.setStrOrderProblems( problemslist.stream()
|
|
|
398
|
+// .map(problem -> problem.getAllName() + "-患病" + problem.getYears()+'年')
|
|
|
399
|
+// .collect(Collectors.joining(",")));
|
|
|
400
|
+// }
|
|
|
401
|
+// else{
|
|
|
402
|
+// orderBase.setStrOrderProblems("");
|
|
|
403
|
+// }
|
|
|
404
|
+
|
|
|
405
|
+
|
|
|
406
|
+
|
|
384
|
407
|
|
|
385
|
408
|
if(!StringHelper.isEmpty(orderBase.getGrade())){
|
|
386
|
409
|
// if(orderBase.getGrade()!=null && orderBase.getGrade()>0){
|