update icon

kongzy

2023-11-01 dd8795a2675e32b25abe98f644f80d5f72fadb90

 src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java

@@ -9,12 +9,12 @@
import com.nanometer.smartlab.exception.AlarmException;
import com.nanometer.smartlab.exception.BusinessException;
import com.nanometer.smartlab.exception.ExceptionEnumCode;
import com.nanometer.smartlab.model.CommonPage;
import com.nanometer.smartlab.util.ExcelUtils;
import com.nanometer.smartlab.util.IDUtils;
import com.nanometer.smartlab.util.MessageUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.dao.DuplicateKeyException;
@@ -23,11 +23,6 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import javax.faces.context.FacesContext;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;

/**
@@ -62,6 +57,34 @@
         throw new BusinessException(ExceptionEnumCode.DB_ERR,
               MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
      }
   }

   @Override
   public CommonPage<SysLaboratory> getSysLaboratoryList(Integer pageNum, Integer pageSize, String name) {
      if(pageNum==null||pageNum<1){
         pageNum=1;
      }
      if(pageSize==null||pageSize<1){
         pageSize=10;
      }
      if(pageSize>50){
         pageSize=50;
      }
      Map<String, Object> params = new HashMap<>();
      if(StringUtils.isNotBlank(name)){
         params.put("name","%"+name+"%");
      }
      params.put("first", (pageNum-1)*pageSize);
      params.put("pageSize", pageSize);
      CommonPage commonPage=new CommonPage();
      commonPage.setPageNum(pageNum);
      commonPage.setPageSize(pageSize);
      Long total=new Long(sysLaboratoryDao.getSysLaboratoryTotalCount(params));
      commonPage.setTotal(total);
      commonPage.setTotalPage(CommonPage.getTotalPage(total,pageSize));
      List<SysLaboratory> sysReagents=sysLaboratoryDao.getSysLaboratorySimpleInfoList(params);
      commonPage.setList(sysReagents);
      return commonPage;
   }

   @Transactional(propagation = Propagation.REQUIRED)
@@ -285,6 +308,20 @@
   }

   @Override
   public List<Map> getPersonInChargeByProjects(String projectStr) {
      List<Map> result = new ArrayList<>();
      String[] projectSplit = projectStr.split(",");
      for (int i = 0; i < projectSplit.length; i++) {
         String project = projectSplit[i];
         if (StringUtils.isBlank(project)) continue;

         List<Map> tail = sysLaboratoryDao.getPersonInCharge(project);
         result.addAll(tail);
      }
      return result;
   }

   @Override
   @Transactional(propagation = Propagation.REQUIRED)
   public List<SysLaboratory> getSysLaboratoryListByDep(String depId) {
      try {