Quellcode durchsuchen

加一个方法

liyuanyuan vor 8 Monaten
Ursprung
Commit
04efa7ec7e

+ 30 - 7
hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -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){

+ 2 - 0
hjzx-mapper/src/main/java/api/mapper/order/WorkOrderBaseMapper.java

@@ -10,11 +10,13 @@ import org.apache.ibatis.annotations.Mapper;
10 10
 import org.apache.xmlbeans.impl.xb.xsdschema.Public;
11 11
 
12 12
 import java.util.List;
13
+import java.util.Map;
13 14
 
14 15
 @Mapper
15 16
 public interface WorkOrderBaseMapper extends BaseMapper<WorkOrderBase> {
16 17
 
17 18
     List<TimeOutReportView> selectTimeOutList(TimeOutReportInput Report);
18 19
 
20
+    List<Map<String, String>> selectOrderProblem();
19 21
 //    public List<TimeOutView> selectTimeOutList(TimeOutReportInput Report);
20 22
 }

+ 9 - 1
hjzx-mapper/src/main/resources/mapper/order/WorkOrderBaseMapper.xml

@@ -25,7 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
25 25
 
26 26
 	</select>
27 27
 
28
-
28
+	<select id="selectOrderProblem"  resultType="map">
29
+			SELECT
30
+			workordercode AS `key`,
31
+	GROUP_CONCAT(CONCAT(all_name, ' (', years, '年)') SEPARATOR ', ') AS `value`
32
+	FROM
33
+	wo_order_problem
34
+	GROUP BY
35
+	workordercode;
36
+</select>
29 37
 
30 38
 
31 39
 

+ 3 - 0
hjzx-service/src/main/java/api/service/order/IWorkOrderBaseService.java

@@ -7,11 +7,14 @@ import api.entity.view.order.TimeOutView;
7 7
 import api.service.IBaseService;
8 8
 
9 9
 import java.util.List;
10
+import java.util.Map;
10 11
 
11 12
 public interface IWorkOrderBaseService extends IBaseService<WorkOrderBase> {
12 13
       List<TimeOutReportView> selectTimeOutList(TimeOutReportInput queryWrapper );
13 14
 
14 15
 //    public List<TimeOutView> selectTimeOutList(TimeOutReportInput queryWrapper );
15 16
 
17
+      List<Map<String, String>> selectOrderProblem();
18
+
16 19
 
17 20
 }

+ 6 - 1
hjzx-service/src/main/java/api/service/order/impl/WorkOrderBaseServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
15 15
 import org.springframework.transaction.annotation.Transactional;
16 16
 
17 17
 import java.util.List;
18
+import java.util.Map;
18 19
 
19 20
 @Transactional
20 21
 @Service
@@ -38,7 +39,11 @@ public class WorkOrderBaseServiceImpl extends BaseServiceImpl<WorkOrderBaseMappe
38 39
     {
39 40
         return orderMapper.selectTimeOutList(Report);
40 41
     }
41
-
42
+    @Override
43
+    public
44
+    List<Map<String, String>> selectOrderProblem(){
45
+        return orderMapper.selectOrderProblem();
46
+    }
42 47
 
43 48
 
44 49
 }