kongzy
2023-10-23 1eeae82f74cbb3469ad8931e45b6fc77a945b912
src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java
@@ -269,8 +269,8 @@
                        try {
                            if(allOpeOrder != null && allOpeOrder.size() > 0)
                            {
                               int count = allOpeOrder.size();
                               this.setRowCount(count);
//                               int count = allOpeOrder.size();
                               this.setRowCount(supplierOpeOrderService.SupplierOpeOrderTotal(orderCode,applyCode,status,orderTime,orderEndTime));
                               list = supplierOpeOrderService.getSupplierOpeOrderList(orderCode,applyCode,status,orderTime,orderEndTime,first,pageSize);
                               for (int i=0;i<list.size();i++) {
@@ -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;
@@ -541,6 +542,9 @@
      System.out.println(this.viewOpeApply.getApplyPrice());
      try {
         this.opeApplyService.updaetOpeApplyPrice(this.viewOpeApply.getApplyPrice(),this.viewOpeApply.getId());
         if (this.viewOpeApply.getReagent() != null && this.viewOpeApply.getReagent().getId() != null) {
            sysReagentService.updateSysReagentPrice(this.viewOpeApply.getReagent().getId(), this.viewOpeApply.getApplyPrice());
         }
         FacesUtils.info("修改成功。");
         refreshTable();
         RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
@@ -789,13 +793,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 +835,7 @@
                     {
                        tempMap.put(opeApply.getReagent().getId(), opeApply.getNum());
                     }
                     opeApply.setOrderStatus(order.getStatus());
                     realDataList.add(opeApply);
                  }
@@ -882,6 +886,8 @@
            headerList.add("申购人");
            headerList.add("部门");
            headerList.add("单位");
            headerList.add("申购单状态");
            headerList.add("订单状态");
         HSSFWorkbook hssfWorkbook =exportExcelNew(headerList, realDataList);
         hssfWorkbook.write(out);
         out.flush();