wangxin пре 1 година
родитељ
комит
e18ba2ea3b

+ 4 - 4
src/main/java/cn/ezhizao/project/business/product/controller/BizProcessInspecionController.java

@@ -262,9 +262,9 @@ public class BizProcessInspecionController extends BaseController
                 .map(String::trim) // 使用String类的trim方法去除字符串两端的空白
                 .collect(Collectors.toList()); // 将结果收集到新的List中
         List<String> processCodeSet = new ArrayList<>();
-        for (String processCode: processCodes) {
-            processCodeSet.add(processCode.trim()) ;
-        }
+//        for (String processCode: processCodes) {
+//            processCodeSet.add(processCode.trim()) ;
+//        }
 
 
         System.out.println("查询工序:processCodeSet"+processCodeSet);
@@ -286,7 +286,7 @@ public class BizProcessInspecionController extends BaseController
         }
 
         detailList = detailList.stream()
-                .filter(detail -> processCodes.contains(detail.getProcessCode()))
+                .filter(detail -> processCodes.stream().anyMatch(l-> l.trim().equals(detail.getProcessCode())))
                 .collect(Collectors.toList());
         if(detailList.size()==0){
             throw new RuntimeException("该批次不需要外协检查");

+ 1 - 1
src/main/resources/mybatis/business/product/BizDayworkItemMapper.xml

@@ -175,7 +175,7 @@
         from biz_daywork_item
         where deleted = 0
           and daywork_id = #{dayworkId}
-          and technological_process_detail_id={technologicalProcessDetailId}
+          and technological_process_detail_id=#{technologicalProcessDetailId}
           and is_wx = 1
         order by create_time desc
     </select>