举手免责和槽液生成曲线

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java

@@ -34,6 +34,14 @@ public class RaiseHand extends BaseEntity {
 	@Schema(description = "提出人")
 	private Long reportUserId;
 	private String reportUserName;
+
+	/**
+	 * 工艺员
+	 */
+	@Schema(description = "工艺员")
+	private Long processUserId;
+	private String processUserName;
+
 	/**
 	 * 岗位
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java

@@ -310,7 +310,8 @@ public class LiquidTankTaskCopyController extends BladeController {
         // value: 任务数据列表
         Map<String, List<LiquidTankTaskCopyVO>> treeMap = new TreeMap<>();
         // 遍历赋值到treeMap中
-        vos.forEach(vo -> {
+        for(LiquidTankTaskCopyVO vo : vos){
+//        vos.forEach(vo -> {
             final Long wtId = vo.getWorkTankId();
             final Long wcId = vo.getWorkCenterId();
 
@@ -318,16 +319,21 @@ public class LiquidTankTaskCopyController extends BladeController {
             final LocalDate date = vo.getSampleDate();
             final String keys = wtId + "_" + wcId + "_" + testElement;
             WorkTank tanke = workTankService.getById(wtId);
-            vo.setWorkTankName(tanke.getWorkTankCode());
+            if(tanke != null){
+                vo.setWorkTankName(tanke.getWorkTankCode());
+            }
+//            vo.setWorkTankName(tanke.getWorkTankCode());
             WorkCenter center = centerService.getById(wcId);
-            vo.setWcName(center.getWcName());
+            if(center != null){
+                vo.setWcName(center.getWcName());
+            }
             // 不包含，新建
             if (!treeMap.containsKey(keys)) {
                 List<LiquidTankTaskCopyVO> list = new ArrayList<>();
                 treeMap.put(keys, list);
             }
             treeMap.get(keys).add(vo);
-        });
+        }
         // 前端要求匹配对象
         LiquidTankWaveDrawVO allVO = new LiquidTankWaveDrawVO();
         List<LiquidTankWaveDrawSingleVO> allChart = allVO.getWaveData();