李宇
2021-04-07 64352b45add6bee426c2d3042fd141e33106abc2
去除导入空白行
已修改8个文件
32 ■■■■■ 文件已修改
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/UserMngController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -290,6 +290,9 @@
                    }
                    valuesList.add(cellInfo);
                }
                if (valuesList.size() != 10){
                    break;
                }
                System.out.println("value :     "+valuesList);
                SysLaboratoryContainer sysLaboratoryContainer=new SysLaboratoryContainer();
                sysLaboratoryContainer.setLaboratoryId(getLabId(sysLaboratories,valuesList.get(0)));
src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -151,8 +151,9 @@
                    }
                    valuesList.add(cellInfo);
                }
                if (valuesList.size() != 8){
                    break;
                }
                System.out.println("value :     "+valuesList);
                SysLaboratory laboratory=new SysLaboratory();
src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
@@ -598,6 +598,9 @@
                    }
                }
                if (valuesList.size() != 6){
                    break;
                }
                System.out.println("value :     "+valuesList);
                sysReagent.setName(valuesList.get(0));//试剂名称
                sysReagent.setProductHome(valuesList.get(1));//厂家
@@ -751,6 +754,9 @@
                        valuesList.add(cellInfo);
                    }
                }
                if (valuesList.size() != 13){
                    break;
                }
                System.out.println("value :     "+valuesList);
                sysReagent.setProductSn(valuesList.get(0));//产品编号
src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -198,6 +198,9 @@
                }
                System.out.println("size :     "+valuesList.size());
                System.out.println("value :     "+valuesList);
                if (valuesList.size() != 14){
                    break;
                }
                SysUser sysUser=new SysUser();
                sysUser.setCompany(valuesList.get(0));//单位
                sysUser.setDepartment(valuesList.get(1));//部门
src/main/java/com/nanometer/smartlab/service/DangerousEncodeServiceImpl.java
@@ -111,6 +111,9 @@
                }
                valuesList.add(cellInfo);
            }
            if (valuesList.size() != 12){
                break;
            }
            //柜号    试剂名称码    试剂名称    CAS号    备注    性状    特性    相忌    状态    灭火器    随机码    编码
            DangerousEncode dangerousEncode = new DangerousEncode();
            dangerousEncode.setContainerNumber(valuesList.get(0));
src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
@@ -171,6 +171,11 @@
                    }
                    valuesList.add(cellInfo);
                }
                if (valuesList.size() != 3){
                    break;
                }
                //重名判断
                String controlName = valuesList.get(0);
                if (controllerInfo.contains(controlName)){
src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java
@@ -213,6 +213,10 @@
                valuesList.add(cellInfo);
            }
            if (valuesList.size() != 4){
                break;
            }
            if (userMap.get(valuesList.get(2)) == null) {
                throw new Exception("课题负责人不存在");
            }
src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java
@@ -218,6 +218,9 @@
                }
                valuesList.add(cellInfo);
            }
            if (valuesList.size() != 4){
                break;
            }
            SysSupplier sysSupplier = new SysSupplier();
            //这一行有供应商是数据库里的就跳过