Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

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

@@ -54,6 +54,7 @@
    */
   private LazyDataModel<OpeReagentStatus> dataModel;
   private String reagentId;
    private String reagentName;
   private String reagentCode;
   private String applyPerson;
   private Date startTime;
@@ -244,11 +245,11 @@
                                       Map<String, Object> filters) {
               List<OpeUseFlow> list = null;
               try {
                  int count = opeUseFlowService.getPersonalUseInfoCount(reagentCode, getUserId(),startTime,endTime,receiptNumber,department,project);
                  int count = opeUseFlowService.getPersonalUseInfoCount(reagentCode, getUserId(),startTime,endTime,receiptNumber,department,project,applyPerson,reagentName);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = opeUseFlowService.getPersonalUseInfoList
                           (reagentCode,  getUserId(),startTime,endTime ,receiptNumber,department,project,first,pageSize);
                           (reagentCode,  getUserId(),startTime,endTime ,receiptNumber,department,project,applyPerson,reagentName,first,pageSize);
                  }
               } catch (Exception e) {
                  logger.error(e);
@@ -365,4 +366,12 @@
   public void setPrintTable(Hashtable printTable) {
      this.printTable = printTable;
   }

    public String getReagentName() {
        return reagentName;
    }

    public void setReagentName(String reagentName) {
        this.reagentName = reagentName;
    }
}