修改

gdg

2021-03-22 c79e850cf9f4262a7644dfd512f671139a221819

 src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java

@@ -67,6 +67,7 @@
    private String cas;
    private List<SysSupplier> supplierSelectList;
    private List<Type> typeList;
    private String productSn;

    public List<Type> getTypeList() {
        if (this.typeList == null) {
@@ -86,7 +87,7 @@
    private Integer type;

    public Integer getType() {
        return type;
        return type == null?0:type;
    }

    public void setType(Integer type) {
@@ -661,7 +662,7 @@
               throw new Exception("导入文件格式不正确");
            }*/

                for (int t = 0; t < totalCells; t++) {
                for (int t = 0; t <= totalCells; t++) {
                    //System.out.println(row.getCell(t));
                    String cellInfo="";
                    String groupId = "";
@@ -798,10 +799,10 @@
                public List<SysReagent> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
                    List<SysReagent> list = null;
                    try {
                        int count = sysReagentService.getSysReagentTotalCount(name, cas, supplierId,type);
                        int count = sysReagentService.getSysReagentTotalCountNew(name, cas, supplierId,getType(),productSn);
                        this.setRowCount(count);
                        if (count > 0) {
                            list = sysReagentService.getSysReagentList(name, cas, supplierId,type, first, pageSize);
                            list = sysReagentService.getSysReagentListNew(name, cas, supplierId,getType(), first, pageSize,productSn);
                        }
                    } catch (Exception e) {
                        logger.error(e);
@@ -897,4 +898,12 @@
    public void setDangerousFlagSelectList(List<DangerousFlag> dangerousFlagSelectList) {
        this.dangerousFlagSelectList = dangerousFlagSelectList;
    }

    public String getProductSn() {
        return productSn;
    }

    public void setProductSn(String productSn) {
        this.productSn = productSn;
    }
}