申购试剂-试剂库优化

gdg

2020-12-01 7f01ee9b40b5ee18f53caed2132bbe6150975b3f

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

@@ -69,22 +69,17 @@
    private Timestamp endDeadline;
    private Integer status;
    private Integer favor;
    private boolean favorFlag;
    private List<ApplyStatus> statusSelectList;

    private LazyDataModel<SysReagent> reagentDataModel;
    private LazyDataModel<SysReagent> reagentFavorDataModel;
    private String applyNewReagentName;
    private String applyNewCas;
    private String applyNewSn;
    private SysReagent selectReagent;

    public boolean isFavorFlag() {
        return favorFlag;
    }

    public void setFavorFlag(boolean favorFlag) {
        this.favorFlag = favorFlag;
    }


    public SysReagent getSelectReagent() {
        return selectReagent;
@@ -519,10 +514,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.getSysReagentTotalCount2(getUser(),favorFlag ? 1 :null,applyNewReagentName, applyNewCas, applyNewSn,null);
                        int count = sysReagentService.favorCount(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn, 0);
                        this.setRowCount(count);
                        if (count > 0) {
                            list = sysReagentService.getSysReagentList2(getUser(),favorFlag ? 1 : null,applyNewReagentName, applyNewCas, applyNewSn,null, first, pageSize);
                            list = sysReagentService.favorList(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn, 0, first, pageSize);
                        }
                    } catch (Exception e) {
                        logger.error(e);
@@ -548,6 +543,45 @@
        }

        return reagentDataModel;
    }


    public LazyDataModel<SysReagent> getReagentFavorDataModel() {
        if (this.reagentFavorDataModel == null) {
            this.reagentFavorDataModel = new LazyDataModel<SysReagent>() {
                @Override
                public List<SysReagent> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
                    List<SysReagent> list = null;
                    try {
                        int count = sysReagentService.favorCount(getUser(), null, null, null,null,1);
                        this.setRowCount(count);
                        if (count > 0) {
                            list = sysReagentService.favorList(getUser(),null, null,null, null,1, first, pageSize);
                        }
                    } catch (Exception e) {
                        logger.error(e);
                    }
                    return list;
                }

                @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;
                }
            };
        }

        return reagentFavorDataModel;
    }

    public LazyDataModel<OpeApply> getApplyHistoryDataModel() {
@@ -915,11 +949,5 @@
    }


    public Integer getFavor() {
        return favor;
    }

    public void setFavor(Integer favor) {
        this.favor = favor;
    }
}