|
@@ -329,6 +329,8 @@ public class AdminMachineController {
|
|
}
|
|
}
|
|
String yearString = yearBf.toString();
|
|
String yearString = yearBf.toString();
|
|
mv.addObject("years", "[" + yearString.substring(0, yearString.length() - 1) + "]");
|
|
mv.addObject("years", "[" + yearString.substring(0, yearString.length() - 1) + "]");
|
|
|
|
+ }else{
|
|
|
|
+ mv.addObject("years", "[]");
|
|
}
|
|
}
|
|
|
|
|
|
//查询最近七天生产机器
|
|
//查询最近七天生产机器
|
|
@@ -344,6 +346,9 @@ public class AdminMachineController {
|
|
String monthDayString = dateBf.toString();
|
|
String monthDayString = dateBf.toString();
|
|
mv.addObject("days", "[" + dayString.substring(0, dayString.length() - 1) + "]");
|
|
mv.addObject("days", "[" + dayString.substring(0, dayString.length() - 1) + "]");
|
|
mv.addObject("monthDay", "[" + monthDayString.substring(0, monthDayString.length() - 1) + "]");
|
|
mv.addObject("monthDay", "[" + monthDayString.substring(0, monthDayString.length() - 1) + "]");
|
|
|
|
+ }else{
|
|
|
|
+ mv.addObject("days", "[]");
|
|
|
|
+ mv.addObject("monthDay", "[]");
|
|
}
|
|
}
|
|
|
|
|
|
/*机器总数及流程异常数*/
|
|
/*机器总数及流程异常数*/
|
|
@@ -386,6 +391,9 @@ public class AdminMachineController {
|
|
mv.addObject("nodeString", "[" + nodeString.substring(0, nodeString.length() - 1) + "]");
|
|
mv.addObject("nodeString", "[" + nodeString.substring(0, nodeString.length() - 1) + "]");
|
|
mv.addObject("desString", "[" + desString.substring(0, desString.length() - 1) + "]");
|
|
mv.addObject("desString", "[" + desString.substring(0, desString.length() - 1) + "]");
|
|
}
|
|
}
|
|
|
|
+ }else{
|
|
|
|
+ mv.addObject("nodeString", "[]");
|
|
|
|
+ mv.addObject("desString", "[]");
|
|
}
|
|
}
|
|
//查询所有产品
|
|
//查询所有产品
|
|
List<Produce> list = produceService.getProduceList();
|
|
List<Produce> list = produceService.getProduceList();
|