xubh 4 years ago
parent
commit
51ce787280

+ 6 - 2
src/main/java/com/minpay/mt/machine/action/MachineManageAction.java

@@ -188,9 +188,13 @@ public class MachineManageAction implements IMINAction {
         List<Map<String, String>> list = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(MachineManageMapper.class)
                 .machineInf(map, rows);
+        List<Map<String, String>> listb = Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(MachineManageMapper.class)
+                .machineInf(map);
+
         //在线数
-        int online = list.stream().filter(item -> item.get("state").equals("00")).collect(Collectors.toList()).size();
-        int unOnline = list.stream().filter(item -> item.get("state").equals("01")).collect(Collectors.toList()).size();
+        int online = listb.stream().filter(item -> item.get("state").equals("00")).collect(Collectors.toList()).size();
+        int unOnline = listb.stream().filter(item -> item.get("state").equals("01")).collect(Collectors.toList()).size();
         //格式化时间和状态
         list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
         list = new MINCopyFormat("{state:'stateDesc',equType :'equTypeDesc'}").format(list);

+ 7 - 3
src/main/webapp/admin/machineManage/editmachine.html

@@ -135,11 +135,15 @@
                                 // 渠道
                                 if (rowData.creditChannel != null) {
                                     if (rowData.creditChannel == "00") {
-                                        $(creditCheckbox[00]).attr("checked", true);
+                                        $(":radio[name='creditChannel'][value='00']").prop("checked", "checked");
                                     } else if (rowData.creditChannel == "01") {
-                                        $(creditCheckbox[01]).attr("checked", true);
+                                        $(":radio[name='creditChannel'][value='01']").prop("checked", "checked");
                                     }else if (rowData.creditChannel == "02"){
-                                        $(creditCheckbox[02]).attr("checked", true);
+                                        $(":radio[name='creditChannel'][value='02']").prop("checked", "checked");
+                                    }else if (rowData.creditChannel == "012") {
+                                        $(":radio[name='creditChannel'][value='012']").prop("checked", "checked");
+                                    }else if (rowData.creditChannel == "016"){
+                                        $(":radio[name='creditChannel'][value='016']").prop("checked", "checked");
                                     }
                                     form.render();
                                 }