生产质量检验消息提醒镀种和材料接口002

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

@@ -191,21 +191,22 @@ public class InspectionTaskController extends BladeController {
                         .eq(RemindMsg::getRemindMsgType, 1L)
                         .orderByDesc(RemindMsg::getId);
                 msgplateList = remindMsgService.list(qw01);
-                int count = 0;
-                if(null != msgplateList && msgplateList.size() > 0){
-                    for(RemindMsg msg : msgplateList){
-                        if(null != msg.getQualityLevel()
-                                && !"".equals(msg.getQualityLevel())){
-                            if(msg.getQualityLevel().equals(prodIdent)){
-                                ++count;
-                                msgplateAllList.add(msg);
-                            }
-                        }
-                    }
-                    if(count == 0){
-                        msgplateAllList = msgplateList;
-                    }
-                }
+                msgplateAllList = msgplateList;
+//                int count = 0;
+//                if(null != msgplateList && msgplateList.size() > 0){
+//                    for(RemindMsg msg : msgplateList){
+//                        if(null != msg.getQualityLevel()
+//                                && !"".equals(msg.getQualityLevel())){
+//                            if(msg.getQualityLevel().equals(prodIdent)){
+//                                ++count;
+//                                msgplateAllList.add(msg);
+//                            }
+//                        }
+//                    }
+//                    if(count == 0){
+//                        msgplateAllList = msgplateList;
+//                    }
+//                }
             }
         }
         RemindMsg msg = new RemindMsg();
@@ -292,6 +293,11 @@ public class InspectionTaskController extends BladeController {
                     }
                 }
             }
+        }else{
+            msg.setCheckParam1("1");
+            msg.setCheckParam2("1");
+            msg.setCheckParam3("1");
+
         }
         return R.data(msg);
     }
@@ -318,6 +324,8 @@ public class InspectionTaskController extends BladeController {
                     }
                 }
             }
+        }else{
+            msg.setCheckMaterial("1");
         }
         return R.data(msg);
     }

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

@@ -222,7 +222,7 @@ public class RaiseHandController extends BladeController {
 
 		liquidTankWave.setIds(ids);
 
-		if(user.getRoleId().equals("2028359258054373378") || user.getNickName().equals("admin")){
+		if(user.getRoleId().contains("2028359258054373378") || user.getNickName().equals("admin")){
 			liquidTankWave.setCheckStatus(null);
 		}else{
 			//工艺人员

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

@@ -221,21 +221,22 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                         .eq(RemindMsg::getRemindMsgType, 0L)
                         .orderByDesc(RemindMsg::getId);
                 msgList = service.list(qw);
-                int count = 0;
-                if(null != msgList && msgList.size() > 0){
-                    for(RemindMsg msg : msgList){
-                        if(null != msg.getQualityLevel()
-                                && !"".equals(msg.getQualityLevel())){
-                            if(msg.getQualityLevel().equals(prodIdent)){
-                                ++count;
-                                msgListNew.add(msg);
-                            }
-                        }
-                    }
-                    if(count == 0){
-                        msgListNew = msgList;
-                    }
-                }
+                msgListNew = msgList;
+//                int count = 0;
+//                if(null != msgList && msgList.size() > 0){
+//                    for(RemindMsg msg : msgList){
+//                        if(null != msg.getQualityLevel()
+//                                && !"".equals(msg.getQualityLevel())){
+//                            if(msg.getQualityLevel().equals(prodIdent)){
+//                                ++count;
+//                                msgListNew.add(msg);
+//                            }
+//                        }
+//                    }
+//                    if(count == 0){
+//                        msgListNew = msgList;
+//                    }
+//                }
             }
 
             if(null != processId && 21L == processId){
@@ -247,21 +248,22 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                         .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE)
                         .orderByDesc(RemindMsg::getId);
                 msgList = service.list(qw);
-                int count = 0;
-                if(null != msgList && msgList.size() > 0){
-                    for(RemindMsg msg : msgList){
-                        if(null != msg.getQualityLevel()
-                                && !"".equals(msg.getQualityLevel())){
-                            if(msg.getQualityLevel().equals(prodIdent)){
-                                ++count;
-                                msgListNew.add(msg);
-                            }
-                        }
-                    }
-                    if(count == 0){
-                        msgListNew = msgList;
-                    }
-                }
+                msgListNew = msgList;
+//                int count = 0;
+//                if(null != msgList && msgList.size() > 0){
+//                    for(RemindMsg msg : msgList){
+//                        if(null != msg.getQualityLevel()
+//                                && !"".equals(msg.getQualityLevel())){
+//                            if(msg.getQualityLevel().equals(prodIdent)){
+//                                ++count;
+//                                msgListNew.add(msg);
+//                            }
+//                        }
+//                    }
+//                    if(count == 0){
+//                        msgListNew = msgList;
+//                    }
+//                }
             }
 
         }