气瓶统计优化

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbStatisticsController.java

@@ -44,10 +44,21 @@ public class DbStatisticsController extends BaseController {
         //入库集合
         bo.setType(1);
         List<DbInOutRecordVo> inList =  dbInOutRecordService.selectInOutListCount(bo);
+        if(inList!=null && inList.size()>0){
+            for (DbInOutRecordVo vo:inList) {
+                vo.setRecordMonth(Integer.valueOf(vo.getYearMonth().split("-")[1]) + "月");
+            }
+        }
+
 
         //出库集合
         bo.setType(2);
         List<DbInOutRecordVo> outList =  dbInOutRecordService.selectInOutListCount(bo);
+        if(outList!=null && outList.size()>0){
+            for (DbInOutRecordVo vo:outList) {
+                vo.setRecordMonth(Integer.valueOf(vo.getYearMonth().split("-")[1]) + "月");
+            }
+        }
 
         map.put("inList",inList);
         map.put("outList",outList);
@@ -99,4 +110,9 @@ public class DbStatisticsController extends BaseController {
         return ResultData.success(list);
     }
 
+    public static void main(String[] args) {
+        String[] str = "01月".split("月");
+        System.out.println(Integer.valueOf(str[0]));
+        System.out.println(str[0]+"||"+str[0]);
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/bigview/BigViewController.java

@@ -514,6 +514,7 @@ public class BigViewController extends BaseController {
                         vo.setRiskName(suvo.getRiskName());
                         vo.setRemark("1");//预案
                         vo.setSubordinateDeptName(suvo.getDeptName());
+                        vo.setBuildId(suvo.getBuildId());
                     }
                 }
             }
@@ -534,9 +535,11 @@ public class BigViewController extends BaseController {
                 subjectControllerVO.setBuildName(warning.getBuildName());
                 subjectControllerVO.setFloorName(warning.getFloorName());
                 subjectControllerVO.setRoom(warning.getRoomNum());
-                subjectControllerVO.setRemark("2");//气瓶
+                //气瓶
+                subjectControllerVO.setRemark("2");
                 subjectControllerVO.setRiskName(warning.getWarningContent()+": "+warning.getName());
                 subjectControllerVO.setSubordinateDeptName(warning.getCollegeName());
+                subjectControllerVO.setBuildId(subjectService.selectLabSubjectById(warning.getId()).getBuildId());
                 list.add(subjectControllerVO);
             }
         }