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

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

@@ -146,7 +146,7 @@ public class InspectionTaskController extends BladeController {
         return R.data(detailDetailVO);
     }
     @PostMapping("/getPlateMsg")
-    public R getPlateMsg(InspectionTaskListVO detailDetail){
+    public R getPlateMsg(@RequestBody InspectionTaskListVO detailDetail){
         String prodIdent = detailDetail.getProdIdent();
         List<RemindMsg> msgplateList = new ArrayList<>();
         List<RemindMsg> msgplateAllList = new ArrayList<>();
@@ -246,23 +246,23 @@ public class InspectionTaskController extends BladeController {
                 BigDecimal param2Down = msg.getParam2Down();
                 if(null != param2Up && null != param2Down){
                     if(detailDetail.getParam2().compareTo(param2Down) >=0 && detailDetail.getParam2().compareTo(param2Up) <=0){
-                        msg.setCheckParam1("0");
+                        msg.setCheckParam2("0");
                     }else{
-                        msg.setCheckParam1("1");
+                        msg.setCheckParam2("1");
                     }
                 }
                 if(null != param2Up && null == param2Down){
                     if(detailDetail.getParam2().compareTo(param2Up) <=0){
-                        msg.setCheckParam1("0");
+                        msg.setCheckParam2("0");
                     }else{
-                        msg.setCheckParam1("1");
+                        msg.setCheckParam2("1");
                     }
                 }
                 if(null == param2Up && null != param2Down){
                     if(detailDetail.getParam2().compareTo(param2Down) >=0){
-                        msg.setCheckParam1("0");
+                        msg.setCheckParam2("0");
                     }else{
-                        msg.setCheckParam1("1");
+                        msg.setCheckParam2("1");
                     }
                 }
 
@@ -274,23 +274,23 @@ public class InspectionTaskController extends BladeController {
                 BigDecimal param3Down = msg.getParam3Down();
                 if(null != param3Up && null != param3Down){
                     if(detailDetail.getParam3().compareTo(param3Down) >=0 && detailDetail.getParam3().compareTo(param3Up) <=0){
-                        msg.setCheckParam1("0");
+                        msg.setCheckParam3("0");
                     }else{
-                        msg.setCheckParam1("1");
+                        msg.setCheckParam3("1");
                     }
                 }
                 if(null != param3Up && null == param3Down){
                     if(detailDetail.getParam3().compareTo(param3Up) <=0){
-                        msg.setCheckParam1("0");
+                        msg.setCheckParam3("0");
                     }else{
-                        msg.setCheckParam1("1");
+                        msg.setCheckParam3("1");
                     }
                 }
                 if(null == param3Up && null != param3Down){
                     if(detailDetail.getParam3().compareTo(param3Down) >=0){
-                        msg.setCheckParam1("0");
+                        msg.setCheckParam3("0");
                     }else{
-                        msg.setCheckParam1("1");
+                        msg.setCheckParam3("1");
                     }
                 }
             }
@@ -304,7 +304,7 @@ public class InspectionTaskController extends BladeController {
     }
 
     @PostMapping("/getMaterialMsg")
-    public R getMaterialMsg(InspectionTaskListVO detailDetail){
+    public R getMaterialMsg(@RequestBody InspectionTaskListVO detailDetail){
         LambdaQueryWrapper<RemindMsg> qw01 = Wrappers.lambdaQuery(RemindMsg.class)
                 .eq(RemindMsg::getFormula, detailDetail.getFormula())
                 .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE)
@@ -317,7 +317,7 @@ public class InspectionTaskController extends BladeController {
             String material = msg.getMaterial();
             if(null != detailDetail.getMaterial()){
                 for(String mat : material.split("、")){
-                    if(detailDetail.getMaterial().contains( mat)){
+                    if(detailDetail.getMaterial().contains(mat.trim())){
                         msg.setCheckMaterial("0");
                         break;
                     }else{