修改

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -35,6 +35,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mysql.cj.x.protobuf.MysqlxCrud;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -48,6 +49,7 @@ import java.util.stream.Collectors;
 //待交办1 ; 待接单（没有处理人的时候）2; 待处理3; 待审核 4 ;待回访5 ;已完结6; 延期审核 列表 8
 @Api(value = "wo_workorderbase",tags = "wo_workorderbase")
 @RestController
+@Slf4j
 @RequestMapping("/order/workorder")
 public class WorkOrderBaseController extends BaseController {
 
@@ -548,17 +550,27 @@ List<WorkOrderType> typelist=workrodertypeService.getList();
 
         if(input.getOrderProblems()!=null && (long) input.getOrderProblems().size() >0){
             List<MainProblem> mainProblems= mainProblemService.getList();
+           // log.info(JSON.toJSONString( mainProblems));
             List<OrderProblem> orderProblems=new ArrayList<>();
             for (OrderProblem op:input.getOrderProblems()){
+
+                if(op.getMainProblemId()==0){
+                    continue;
+                }
+
                 op.setWorkordercode(input.getWorkordercode());
                 op.setCreateTime(currentDate);
                 op.setIsDelete(0L);
-                op.setAllName(  mainProblems.stream()
-                        .filter(x -> x.getId() == op.getMainProblemId())
-                        .findFirst()
-                        .map(MainProblem::getAllTypeName)
-                        .orElse(null) // 或者提供一个默认值
-                );
+                Long mid=op.getMainProblemId();
+                log.info(String.valueOf(mid));
+                List<MainProblem> ms=mainProblems.stream()
+                        .filter(x -> x.getId().equals(mid ))
+                                .collect(Collectors.toList());
+                String name="";
+                if(!ms.isEmpty())name=ms.get(0).getAllTypeName();
+             //   log.info(name);
+                op.setAllName(  name   );
+
               orderProblems.add(op);
 
             }
@@ -640,18 +652,32 @@ List<WorkOrderType> typelist=workrodertypeService.getList();
         qw.set(OrderProblem::getIsDelete,1);
         orderProblemService.updateBatch(qw);
         if(input.getOrderProblems()!=null && (long) input.getOrderProblems().size() >0){
+
+
             List<MainProblem> mainProblems= mainProblemService.getList();
             List<OrderProblem> orderProblems=new ArrayList<>();
             for (OrderProblem op:input.getOrderProblems()){
+                if(op.getMainProblemId()==0){
+                    continue;
+                }
                 op.setWorkordercode(orderBase.getWorkordercode());
                 op.setCreateTime(currentDate);
                 op.setIsDelete(0L);
-                op.setAllName(  mainProblems.stream()
-                        .filter(x -> x.getId() == op.getMainProblemId())
-                        .findFirst()
-                        .map(MainProblem::getAllTypeName)
-                        .orElse(null) // 或者提供一个默认值
-                );
+//                op.setAllName(  mainProblems.stream()
+//                        .filter(x -> Objects.equals(x.getId(), op.getMainProblemId()))
+//                        .findFirst()
+//                        .map(MainProblem::getAllTypeName)
+//                        .orElse(null) // 或者提供一个默认值
+//                );
+                Long mid=op.getMainProblemId();
+                List<MainProblem> ms=mainProblems.stream()
+                        .filter(x -> x.getId().equals(mid ))
+                        .collect(Collectors.toList());
+                String name="";
+                if(!ms.isEmpty())name=ms.get(0).getAllTypeName();
+                //   log.info(name);
+                op.setAllName(  name   );
+
                 op.setId(null);
                 orderProblems.add(op);