申购管理申请履历显示所有历史单据，提交时如有无效试剂耗材报错

李宇

2021-08-18 c3510da29a7974c6af7ff3de1ade3db429d6f848

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

@@ -7,6 +7,7 @@
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.FacesUtils;
import com.nanometer.smartlab.util.IDUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -811,6 +812,7 @@
                        if (count > 0) {
                            list = sysReagentService.getSysReagentListNew(name, cas, supplierId,getType(), first, pageSize,productSn);
                        }
                        selectedList = new ArrayList<> ();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -819,17 +821,18 @@

                @Override
                public SysReagent getRowData(String rowKey) {
                    Iterator<SysReagent> iterator = this.iterator();
                    if (iterator != null) {
                        SysReagent sr = null;
                        while (iterator.hasNext()) {
                            sr = iterator.next();
                            if (rowKey.equals(sr.getId())) {
                                return sr;
                            }
                        }
                    }
                    return null;
//                    Iterator<SysReagent> iterator = this.iterator();
//                    if (iterator != null) {
//                        SysReagent sr = null;
//                        while (iterator.hasNext()) {
//                            sr = iterator.next();
//                            if (rowKey.equals(sr.getId())) {
//                                return sr;
//                            }
//                        }
//                    }

                    return sysReagentService.getSysReagent(rowKey);
                }
            };
        }
@@ -837,6 +840,20 @@
        return dataModel;
    }

    public void export2Excel() {

        List<Map> list = sysReagentService.selectAll(name, cas, supplierId,getType(), productSn);
        try{
            boolean isexport = sysReagentService.export2Excel(list,getType());
            if (isexport){

            }
        }catch (Exception e){
            e.printStackTrace();
            FacesUtils.warn("导出失败");
        }
    }

    public SysReagent getSysReagent() {
        return sysReagent;
    }