订单领取：过期处理(确认和过期 状态处理),增加状态过期（需要将数据库字段加长） 实验室选中问题 仓库领取的仓库不存在问题

lyfO_o

2021-06-11 df47c9300bfe6c641c88707aa5b54591ab4c004c

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

@@ -9,6 +9,7 @@
import com.nanometer.smartlab.entity.dto.ApplyListDto;
import com.nanometer.smartlab.service.SysUserService;
import com.nanometer.smartlab.util.Utils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.primefaces.context.RequestContext;
import org.primefaces.model.LazyDataModel;
@@ -46,6 +47,8 @@
   private Date endDate;

   private Hashtable printTable;

   private String containerCode;

   public String getHouseName() {
      return houseName;
@@ -98,10 +101,10 @@
                  Map<String, Object> filters) {
               List<OpeUseFlow> list = null;
               try {
                  int count = opeUseFlowService.getOpeUseFlowTotalCountByName(houseName,reagentId, reagentCode, null, getUserId(),startDate,endDate);
                  int count = opeUseFlowService.getOpeUseFlowTotalCountByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = opeUseFlowService.getOpeUseFlowListByName(houseName,reagentId, reagentCode, null, getUserId(),startDate,endDate, first, pageSize);
                     list = opeUseFlowService.getOpeUseFlowListByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate, first, pageSize);
                  }
               } catch (Exception e) {
                  logger.error(e);
@@ -164,14 +167,19 @@
      List<ApplyListDto> applyList = new ArrayList<>();
      //获取当时操作状态为领取的人员
      Map<String,String>  info= opeUseFlowService.getApplyUserByReagentCode(code);
      Map applyPersonInfo = sysUserService.getUser(info.get("user_id"));
      SysUser applyPersonInfo = sysUserService.getUser(info.get("user_id"));
      printTable.put("head", instituteName);
      printTable.put("title", "领用单");
      printTable.put("applyPerson", applyPersonInfo.get("name"));
      printTable.put("department", applyPersonInfo.get("meta_value"));
      printTable.put("applyPerson", applyPersonInfo.getName());
      printTable.put("department", applyPersonInfo.getDepartment());
      String time = new SimpleDateFormat("yyyy-MM-dd").format(info.get("create_time"));
      printTable.put("date", time);
      printTable.put("phone", applyPersonInfo.get("phone"));
      if (StringUtils.isNotBlank(applyPersonInfo.getPhone())){
         printTable.put("phone", applyPersonInfo.getPhone());
      }
      if (StringUtils.isNotBlank(applyPersonInfo.getProject())){
         printTable.put("project", applyPersonInfo.getProject());
      }

      printTable.put("receiptNumber", receiptNumber);
      for (Map.Entry<String, Integer> map  : printInfo.entrySet()) {
@@ -227,4 +235,12 @@
   public void setPrintTable(Hashtable printTable) {
      this.printTable = printTable;
   }

   public String getContainerCode() {
      return containerCode;
   }

   public void setContainerCode(String containerCode) {
      this.containerCode = containerCode;
   }
}