生产质量检验修改

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -172,6 +172,11 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 
         InspectionTaskListVO detailDetail = this.detailById(task);
         vo.setOrderInfo(detailDetail);
+        if(null == detailDetail.getCurrentProcessName()){
+            vo.setProcessName("");
+        }else{
+            vo.setProcessName(detailDetail.getCurrentProcessName());
+        }
         // todo:
         RemindMsg msg1 = new RemindMsg();
         msg1.setRemindContent("提醒信息-" + System.currentTimeMillis());

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java

@@ -28,6 +28,7 @@ import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
 import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail;
 import org.springblade.desk.quality.pojo.vo.InspectionItemVO;
 import org.springblade.desk.quality.pojo.vo.StandardVO;
+import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO;
 import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO;
 import org.springblade.desk.quality.service.*;
 import org.springblade.desk.quality.wrapper.InspectionItemWrapper;
@@ -38,6 +39,7 @@ import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -87,7 +89,8 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
             R<UserInfo> rUI = userClient.userInfo(vo.getCheckUserId());
             if (rUI != null && rUI.isSuccess() && rUI.getData().getUser() != null) {
                 vo.setCheckUserRealName(rUI.getData().getUser().getRealName());
-            }
+            }else{
+                vo.setCheckUserRealName("");            }
         }
         {
             InspectionItem item = inspectionItemService.getById(vo.getItemId());
@@ -110,7 +113,13 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
                     InspectionItemConst.SPECIAL_TYPE_HARD.equals(vo.getItem().getSpecialType()) ||
                     InspectionItemConst.SPECIAL_TYPE_SIZE.equals(vo.getItem().getSpecialType())
             ) {
-                vo.setWpItemDetailList(wpItemDetailService.listVOByWorkPlanItemId(vo.getId()));
+                List<WorkPlanItemDetailVO> list =  wpItemDetailService.listVOByWorkPlanItemId(vo.getId());
+                if(null == list || list.size() == 0){
+                    vo.setWpItemDetailList(new ArrayList<>());
+                }else{
+                    vo.setWpItemDetailList(list);
+                }
+//                vo.setWpItemDetailList(wpItemDetailService.listVOByWorkPlanItemId(vo.getId()));
                 vo.setThicknessList(wpItemThicknessService.listThicknessByWorkPlanItemId(vo.getId()));
             }
         }