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

李宇

2021-08-18 c3510da29a7974c6af7ff3de1ade3db429d6f848

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

@@ -475,7 +475,8 @@
            }else {
               dataRow.createCell(22).setCellValue(String.valueOf(company.getMetaValue()));
            }

            dataRow.createCell(23).setCellValue(String.valueOf(dataList.get(i).getStatus().getText()));
            dataRow.createCell(24).setCellValue(String.valueOf(dataList.get(i).getOrderStatus().getText()));
         }

      return hssfWorkbook;
@@ -789,13 +790,12 @@
                    if( opeApply != null)
                    {
                       if(opeApply.getStockFlag()!=0){
                     SysUser user1=null;
                     if(opeApply.getBeforeApproveUserId()!=null&&!opeApply.getBeforeApproveUserId().equals("")){
                        user1=sysUserService.getSysUserForSuppllier(opeApply.getBeforeApproveUserId());
                     }else {
                        user1 = sysUserService.getSysUserForSuppllier(opeApply.getApproveUserId());
                     }

//                     SysUser user1=null;
//                     if(opeApply.getBeforeApproveUserId()!=null&&!opeApply.getBeforeApproveUserId().equals("")){
//                        user1=sysUserService.getSysUserForSuppllier(opeApply.getBeforeApproveUserId());
//                     }else {
//                        user1 = sysUserService.getSysUserForSuppllier(opeApply.getApproveUserId());
//                     }
                     //opeApply.setOwnerDepartment(user1.getDepartment());
                     //System projectUser=
                     opeApply.setOwnerDepartment(sysUserService.getSysUserForSuppllier(opeApply.getApplyUserId()).getDepartment());
@@ -832,6 +832,7 @@
                     {
                        tempMap.put(opeApply.getReagent().getId(), opeApply.getNum());
                     }
                     opeApply.setOrderStatus(order.getStatus());
                     realDataList.add(opeApply);
                  }

@@ -882,6 +883,8 @@
            headerList.add("申购人");
            headerList.add("部门");
            headerList.add("单位");
            headerList.add("申购单状态");
            headerList.add("订单状态");
         HSSFWorkbook hssfWorkbook =exportExcelNew(headerList, realDataList);
         hssfWorkbook.write(out);
         out.flush();