增加部分搜索

gdg

2021-01-29 f675672004af0ff9071d21546a0eee0a0c8f3092

增加部分搜索

 src/main/java/com/nanometer/smartlab/api/ApiAction.java

@@ -567,7 +567,7 @@
        logger.info("getUserInfo start...");

        List<SysUser> userList = sysUserService.getSysUserInfoList(startTime, endTime);
        List<SysLaboratoryContainer> allLaboratoryContainerList = sysLaboratoryContainerService.getSysLaboratoryContainerList(null,null,null,null,null);
        List<SysLaboratoryContainer> allLaboratoryContainerList = sysLaboratoryContainerService.getSysLaboratoryContainerList(null,null,null,null,null,null,null);
        List<SysWarehouseContainer> allWarehouseContainerList = sysWarehouseContainerService.getSysWarehouseContainerList(null,null,null,null,null);

        List<String> containerCodeList = new ArrayList<String>();

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

@@ -72,6 +72,8 @@

    private String laboratoryType;
    private String laboratoryName;
    private String project;
    private String controllerName;

    private int action;

@@ -384,11 +386,11 @@
                    List<SysLaboratoryContainer> list = null;
                    try {
                        int count = sysLaboratoryContainerService.getSysLaboratoryContainerTotalCount(laboratoryType,
                                laboratoryName,null);
                                laboratoryName,null,project,controllerName);
                        this.setRowCount(count);
                        if (count > 0) {
                            list = sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryType,
                                    laboratoryName,null, first, pageSize);
                                    laboratoryName,null,project,controllerName, first, pageSize);
                        }
                    } catch (Exception e) {
                        logger.error(e);
@@ -471,4 +473,19 @@
        this.controllers = controllers;
    }

    public String getProject() {
        return project;
    }

    public void setProject(String project) {
        this.project = project;
    }

    public String getControllerName() {
        return controllerName;
    }

    public void setControllerName(String controllerName) {
        this.controllerName = controllerName;
    }
}

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

@@ -60,6 +60,7 @@
    private List<SysLaboratory> selectedList;
    private String type;
    private String name;
    private String project;

    private int action;

@@ -279,10 +280,10 @@
                        Map<String, Object> filters) {
                    List<SysLaboratory> list = null;
                    try {
                        int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name);
                        int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name,project);
                        this.setRowCount(count);
                        if (count > 0) {
                            list = sysLaboratoryService.getSysLaboratoryList(type, name, first, pageSize);
                            list = sysLaboratoryService.getSysLaboratoryList(type, name,project, first, pageSize);
                        }
                    } catch (Exception e) {
                        logger.error(e);
@@ -344,4 +345,12 @@
    public void setType(String type) {
        this.type = type;
    }

    public String getProject() {
        return project;
    }

    public void setProject(String project) {
        this.project = project;
    }
}

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

@@ -47,6 +47,8 @@

    private Hashtable printTable;

    private String containerCode;

    public String getHouseName() {
        return houseName;
    }
@@ -98,10 +100,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);
@@ -227,4 +229,12 @@
    public void setPrintTable(Hashtable printTable) {
        this.printTable = printTable;
    }

    public String getContainerCode() {
        return containerCode;
    }

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

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

@@ -63,7 +63,7 @@
    private Map<String, List<SysWarehouseContainer>> warehouseIdContainerMap;

    public void initRukuPage() {
        this.userSelectList = this.sysUserService.getSysUserList(null, null, null, null, null);
        this.userSelectList = this.sysUserService.getSysUserList(null, null, null, null, null,null,null);
        //将admin置于首位
        for (int i = 0; i < userSelectList.size(); i++) {
            if ("admin".equals(userSelectList.get(i).getAccount())){

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

@@ -73,7 +73,7 @@

    private void initUserSelectList() {
        logger.info("WarehouseStockMngController initUserSelectList start");
        this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null));
        this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null,null,null));
    }
    public void setUserSelectList(List<SysUser> userSelectList) {
        this.userSelectList = userSelectList;

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

@@ -71,6 +71,8 @@
    private List<BaseMeta> codeList;
    private List<BaseRole> roleList;
    private List<Waster> wasterSelectList;
    private String project;
    private String company;

    public List<BaseRole> getRoleList() {
        return roleList;
@@ -488,10 +490,10 @@
                public List<SysUser> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
                    List<SysUser> list = null;
                    try {
                        int count = sysUserService.getSysUserTotalCount(arp, name,departmentName);
                        int count = sysUserService.getSysUserTotalCount(arp, name,departmentName,project,company);
                        this.setRowCount(count);
                        if (count > 0) {
                            list = sysUserService.getSysUserList(arp, name,departmentName, first, pageSize);
                            list = sysUserService.getSysUserList(arp, name,departmentName,project,company, first, pageSize);
                        }
                    } catch (Exception e) {
                        logger.error(e);
@@ -617,4 +619,20 @@
    public void setDepartmentName(String departmentName) {
        this.departmentName = departmentName;
    }

    public String getProject() {
        return project;
    }

    public void setProject(String project) {
        this.project = project;
    }

    public String getCompany() {
        return company;
    }

    public void setCompany(String company) {
        this.company = company;
    }
}

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

@@ -163,6 +163,7 @@
    private String endReagentCode;
    private String startReagentCodeForPerson;
    private String endReagentCodeForPerson;
    private String warehouseName;

    private Integer editFlag;
    private StreamedContent file;
@@ -373,7 +374,7 @@

    private void initUserSelectList() {
        logger.info("WarehouseStockMngController initUserSelectList start");
        this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null));
        this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null,null,null));
        /**if(sysUserService.getSysUser(userId) == null)
        {
            this.laboratory = this.sysLaboratoryService.getSysLaboratoryListByDep(this.getUserDepartment());
@@ -1658,11 +1659,11 @@
                        Map<String, Object> filters) {
                    List<OpeWarehouseReserve> list = null;
                    try {
                        int count = opeWarehouseReserveService.getOpeWarehouseReserveTotalCountByName(reagentId, supplierId,productSn);
                        int count = opeWarehouseReserveService.getOpeWarehouseReserveTotalCountByName(reagentId, supplierId,productSn,warehouseName);
                        this.setRowCount(count);
                        if (count > 0) {
                            list = opeWarehouseReserveService.getOpeWarehouseReserveListByName(reagentId, supplierId, first,
                                    pageSize,productSn);
                                    pageSize,productSn,warehouseName);
                        }
                    } catch (Exception e) {
                        logger.error(e);
@@ -1934,7 +1935,7 @@
                realDataList=selectedList;
            }else {
                realDataList = opeWarehouseReserveService.getOpeWarehouseReserveListByName(reagentId, supplierId, null,
                        null,productSn);
                        null,productSn,warehouseName);
            }
                List<String> headerList = new ArrayList<>();
                headerList.add("试剂名称");
@@ -2535,7 +2536,7 @@
                list.add(sysUser);
                applyUserSelectList = list;
            } else {
                applyUserSelectList = this.sysUserService.getSysUserList(null, null, null, null, null);
                applyUserSelectList = this.sysUserService.getSysUserList(null, null, null, null, null,null,null);
            }
        }
        return applyUserSelectList;
@@ -2864,7 +2865,7 @@
    }

    public List getConsignee() {
        List<SysUser> dataList = this.sysUserService.getSysUserList(null, null, null, null, null);
        List<SysUser> dataList = this.sysUserService.getSysUserList(null, null, null, null, null,null,null);
        //将admin置于首位
        for (int i = 0; i < dataList.size(); i++) {
            if ("admin".equals(dataList.get(i).getAccount())){
@@ -3002,4 +3003,12 @@
    public void setReceiptNumber(String receiptNumber) {
        this.receiptNumber = receiptNumber;
    }

    public String getWarehouseName() {
        return warehouseName;
    }

    public void setWarehouseName(String warehouseName) {
        this.warehouseName = warehouseName;
    }
}

 src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml

@@ -85,6 +85,10 @@
    <if test="endDate != null and endDate !=''">
        and oa.create_time &lt;= #{endDate}
    </if>
    <if test="containerCode != null and containerCode !=''">
        and wc.container_code = #{containerCode}
        or lc.container_code =#{containerCode}
    </if>
  </sql>

    <sql id="queryColumns">

 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml

@@ -57,6 +57,9 @@
    <if test="productSn != null and productSn != ''">
        and sr.product_sn like concat('%',#{productSn},'%')
    </if>
      <if test="warehouseName != null and warehouseName != ''">
          and sw.name like concat('%',#{warehouseName},'%')
      </if>
  </sql>

  <sql id="queryColumns">

 src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml

@@ -67,6 +67,12 @@
    <if test="laboratoryName != null and laboratoryName != ''">
      and ss.name like #{laboratoryName}
    </if>
    <if test="project != null and project != ''">
      and su.project like concat("%",#{project},"%")
    </if>
    <if test="controllerName != null and controllerName != ''">
      and sc.controller_name like concat("%",#{controllerName},"%")
    </if>
    order by ss.name ASC,sc.controller_name,su.container_code,su.name
    <if test="first != null and pageSize != null">
      limit #{first}, #{pageSize}
@@ -127,6 +133,12 @@
    <if test="editId != null and editId != ''">
      and su.id != #{editId}
    </if>
    <if test="project != null and project != ''">
      and su.project like concat("%",#{project},"%")
    </if>
    <if test="controllerName != null and controllerName != ''">
      and sc.controller_name like concat("%",#{controllerName},"%")
    </if>
  </select>

  <insert id="insertSysLaboratoryContainer" parameterType="com.nanometer.smartlab.entity.SysLaboratoryContainer">

 src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml

@@ -74,6 +74,12 @@
    <if test="waster != null">
        and su.waster = #{waster}
    </if>
    <if test="project != null and project != ''">
        and su.project like concat("%",#{project},"%")
    </if>
    <if test="company != null and company != ''">
         and bm1.meta_value like concat("%",#{company},"%")
    </if>
  </sql>

  <select id="getSysUser" parameterType="java.lang.String"  resultMap="SysUser" >
@@ -117,6 +123,7 @@
    select su.*, br.name as roleName from sys_user as su
    left join base_role as br on su.role_id = br.id
      left join base_meta bm on su.department = bm.id
      left join base_meta bm1 on bm1.id = su.company
    where su.valid_flag = 1
      <if test="departmentNameLike != null and departmentNameLike != ''">
          and bm.meta_value  like #{departmentNameLike}
@@ -150,7 +157,9 @@
  </select>

  <select id="getSysUserTotalCount" parameterType="java.util.Map" resultType="int">
    select count(1) from sys_user as su left join base_meta bm on su.department = bm.id
    select count(1) from sys_user as su
    left join base_meta bm on su.department = bm.id
    left join base_meta bm1 on bm1.id = su.company
    where su.valid_flag = 1
      <if test="departmentNameLike != null and departmentNameLike != ''">
          and bm.meta_value  like #{departmentNameLike}

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

@@ -23,10 +23,10 @@

    int getOpeUseFlowTotalCount(String reagentId, String reagentCode, Integer status, String userId);

    List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode, Integer status, String userId, Date startDate,Date endDate,
    List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate,
            Integer first, Integer pageSize);

    int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode, Integer status, String userId, Date startDate,Date endDate);
    int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate);

    boolean update(OpeUseFlow opeUseFlow);


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

@@ -136,7 +136,7 @@
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode, Integer status, String userId,
    public List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId,
                                                    Date startDate,Date endDate,Integer first, Integer pageSize) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
@@ -176,6 +176,7 @@

            params.put("status", status);
            params.put("houseName", houseName);
            params.put("containerCode", containerCode);
            addParamByUserId(userId, params);

            params.put("first", first);
@@ -189,7 +190,7 @@
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public int getOpeUseFlowTotalCountByName(String houseName,String reagentId, String reagentCode, Integer status, String userId,Date startDate,Date endDate) {
    public int getOpeUseFlowTotalCountByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId,Date startDate,Date endDate) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("reagentName", reagentId);
@@ -227,6 +228,7 @@
            }

            params.put("houseName", houseName);
            params.put("containerCode", containerCode);
            addParamByUserId(userId, params);

            params.put("status", status);

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

@@ -16,8 +16,8 @@
                                                         Integer pageSize);
    int getOpeWarehouseReserveTotalCount(String reagentId, String supplierId);
    List<OpeWarehouseReserve> getOpeWarehouseReserveListByName(String reagentId, String supplierId, Integer first,
            Integer pageSize,String productSn);
    int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn);
            Integer pageSize,String productSn,String warehouseName);
    int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn,String warehouseName);
    OpeWarehouseReserve getOpeWarehouseReserve(String reagentId, String articleNumber);
    OpeWarehouseReserve getOpeWarehouseReserve2(String reagentId, String articleNumber,String warehouseId);


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

@@ -94,7 +94,7 @@

    @Transactional(propagation = Propagation.REQUIRED)
    public List<OpeWarehouseReserve> getOpeWarehouseReserveListByName(String reagentId, String supplierId, Integer first,
            Integer pageSize,String productSn) {
            Integer pageSize,String productSn,String warehouseName) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("reagentName", reagentId);
@@ -102,6 +102,7 @@
            params.put("first", first);
            params.put("pageSize", pageSize);
            params.put("productSn", productSn);
            params.put("warehouseName", warehouseName);
            return this.opeWarehouseReserveDao.getOpeWarehouseReserveList(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);
@@ -111,12 +112,13 @@
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn) {
    public int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn,String warehouseName) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("reagentName", reagentId);
            params.put("supplierId", supplierId);
            params.put("productSn", productSn);
            params.put("warehouseName", warehouseName);
            return this.opeWarehouseReserveDao.getOpeWarehouseReserveTotalCount(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);

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

@@ -11,9 +11,10 @@
 */
public interface SysLaboratoryContainerService {

    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, String laboratoryId, Integer first, Integer pageSize);
    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, String laboratoryId
            ,String project,String controllerName, Integer first, Integer pageSize);
    List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryId);
    int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName,String laboratoryId);
    int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName,String laboratoryId,String project,String controllerName);
    SysLaboratoryContainer getSysLaboratoryContainer(String id);
    SysLaboratoryContainer getSysLaboratoryContainerByContainerCode(String containerCode);
    SysLaboratoryContainer insertSysLaboratoryContainer(SysLaboratoryContainer sysLaboratory);

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

@@ -38,7 +38,7 @@

    @Transactional(propagation = Propagation.REQUIRED)
    public List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName,
            String laboratoryId, Integer first, Integer pageSize) {
            String laboratoryId,String project,String controllerName, Integer first, Integer pageSize) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(laboratoryType)) {
@@ -50,6 +50,8 @@
            if (StringUtils.isNotBlank(laboratoryId)) {
                params.put("laboratoryId", laboratoryId);
            }
            params.put("project", project);
            params.put("controllerName", controllerName);
            params.put("first", first);
            params.put("pageSize", pageSize);
            return this.sysLaboratoryContainerDao.getSysLaboratoryContainerList(params);
@@ -63,11 +65,11 @@
    @Transactional(propagation = Propagation.REQUIRED)
    public List<SysLaboratoryContainer> getSysLaboratoryContainerList(
            String laboratoryId) {
         return getSysLaboratoryContainerList(null,null,laboratoryId,null,null);
         return getSysLaboratoryContainerList(null,null,laboratoryId,null,null,null,null);
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName, String laboratoryId) {
    public int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName, String laboratoryId,String project,String controllerName) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(laboratoryType)) {
@@ -79,6 +81,8 @@
            if (StringUtils.isNotBlank(laboratoryId)) {
                params.put("laboratoryId", laboratoryId);
            }
            params.put("project", project);
            params.put("controllerName", controllerName);
            return this.sysLaboratoryContainerDao.getSysLaboratoryContainerTotalCount(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);

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

@@ -11,13 +11,13 @@
 */
public interface SysLaboratoryService {

    List<SysLaboratory> getSysLaboratoryList(String type, String name, Integer first, Integer pageSize);
    List<SysLaboratory> getSysLaboratoryList(String type, String name, String project, Integer first, Integer pageSize);

    List<SysLaboratory> getAllSysLaboratoryList();

    List<SysLaboratory> getSysLaboratoryListByDep(String depId);

    int getSysLaboratoryTotalCount(String type, String name);
    int getSysLaboratoryTotalCount(String type, String name,String project);

    boolean isSysLaboratoryExist(String barCode, String editId);


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

@@ -44,7 +44,7 @@
    SysUserDao sysUserDao;

    @Transactional(propagation = Propagation.REQUIRED)
    public List<SysLaboratory> getSysLaboratoryList(String type, String name, Integer first, Integer pageSize) {
    public List<SysLaboratory> getSysLaboratoryList(String type, String name,String project,Integer first, Integer pageSize) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(type)) {
@@ -53,6 +53,7 @@
            if (StringUtils.isNotBlank(name)) {
                params.put("name", "%" + name + "%");
            }
            params.put("project", project);
            params.put("first", first);
            params.put("pageSize", pageSize);
            return this.sysLaboratoryDao.getSysLaboratoryList(params);
@@ -64,7 +65,7 @@
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public int getSysLaboratoryTotalCount(String type, String name) {
    public int getSysLaboratoryTotalCount(String type, String name,String project) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(type)) {
@@ -73,6 +74,7 @@
            if (StringUtils.isNotBlank(name)) {
                params.put("name", "%" + name + "%");
            }
            params.put("project", project);
            return this.sysLaboratoryDao.getSysLaboratoryTotalCount(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);

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

@@ -163,7 +163,7 @@
    @Transactional
    public void importProject(FileUploadEvent event,SysUser currentUser) throws Exception {

        List<SysUser> userList = sysUserService.getSysUserList(null, null, null, null, null);
        List<SysUser> userList = sysUserService.getSysUserList(null, null, null, null, null,null,null);
        List<SysProject> sysProjectList = sysProjectDao.getSysProjectList(new HashMap());
        Map<String,String> userMap = new HashMap();
        Map<String,String> projectMap = new HashMap();

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

@@ -14,8 +14,8 @@
 */
public interface SysUserService {

    List<SysUser> getSysUserList(String arp, String name,String departmentName, Integer first, Integer pageSize);
    int getSysUserTotalCount(String arp, String name,String departmentName);
    List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company,Integer first, Integer pageSize);
    int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company);
    SysUser getSysUser(String id);
    SysUser getSysUserForSuppllier(String id);
    SysUser getSysUserByAccount(String account);

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

@@ -43,7 +43,7 @@
    SysUserDao sysUserDao;

    @Transactional(propagation = Propagation.REQUIRED)
    public List<SysUser> getSysUserList(String arp, String name,String departmentName, Integer first, Integer pageSize) {
    public List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company, Integer first, Integer pageSize) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(arp)) {
@@ -55,6 +55,8 @@
            if (StringUtils.isNotBlank(departmentName)) {
                params.put("departmentNameLike", "%" + departmentName + "%");
            }
            params.put("project", project);
            params.put("company", company);
            params.put("first", first);
            params.put("pageSize", pageSize);
            return this.sysUserDao.getSysUserList(params);
@@ -64,7 +66,7 @@
        }
    }
    @Transactional(propagation = Propagation.REQUIRED)
    public int getSysUserTotalCount(String arp, String name,String departmentName) {
    public int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            if (StringUtils.isNotBlank(arp)) {
@@ -76,6 +78,8 @@
            if (StringUtils.isNotBlank(departmentName)) {
                params.put("departmentNameLike", "%" + departmentName + "%");
            }
            params.put("project", project);
            params.put("company", company);
            return this.sysUserDao.getSysUserTotalCount(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);

 src/main/webapp/laboratory_container_mng.xhtml

@@ -12,7 +12,7 @@
    <h:form id="laboratoryContainerMngForm">
        <p:panel styleClass="center-header">
            <p:outputLabel styleClass="title" value="实验室临时存储库管理"></p:outputLabel>
            <p:panelGrid styleClass="filter" columns="5">
            <p:panelGrid styleClass="filter" columns="9">
                <p:outputLabel value="实验室类型："></p:outputLabel>
                <p:selectOneMenu value="#{laboratoryContainerMngController.laboratoryType}">
                    <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
@@ -24,6 +24,12 @@
                <p:outputLabel value="实验室名："></p:outputLabel>
                <p:inputText value="#{laboratoryContainerMngController.laboratoryName}"></p:inputText>

                <p:outputLabel value="课题名称："></p:outputLabel>
                <p:inputText value="#{laboratoryContainerMngController.project}"></p:inputText>

                <p:outputLabel value="主控名称："></p:outputLabel>
                <p:inputText value="#{laboratoryContainerMngController.controllerName}"></p:inputText>

                <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
            </p:panelGrid>
        </p:panel>

 src/main/webapp/laboratory_mng.xhtml

@@ -12,7 +12,7 @@
    <h:form id="laboratoryMngForm">
        <p:panel styleClass="center-header">
            <p:outputLabel styleClass="title" value="实验室管理"></p:outputLabel>
            <p:panelGrid styleClass="filter" columns="5">
            <p:panelGrid styleClass="filter" columns="7">
                <p:outputLabel value="实验室类型："></p:outputLabel>
                <p:selectOneMenu value="#{laboratoryMngController.type}">
                    <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
@@ -24,6 +24,9 @@
                <p:outputLabel value="实验室名："></p:outputLabel>
                <p:inputText value="#{laboratoryMngController.name}"></p:inputText>

                <p:outputLabel value="课题组："></p:outputLabel>
                <p:inputText value="#{laboratoryMngController.project}"></p:inputText>

                <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
            </p:panelGrid>
        </p:panel>

 src/main/webapp/reagent_user_flow_info.xhtml

@@ -14,7 +14,7 @@
            <p:outputLabel styleClass="title" value="试剂流向追踪"></p:outputLabel>

            <p:panel styleClass="center-header">
                <p:panelGrid styleClass="filter" columns="11">
                <p:panelGrid styleClass="filter" columns="13">
                    <p:outputLabel value="开始时间："></p:outputLabel>
                    <p:calendar value="#{opeUseFlowInfoController.startDate}"></p:calendar>

@@ -27,6 +27,9 @@
                    <p:outputLabel value="条形码："></p:outputLabel>
                    <p:inputText value="#{opeUseFlowInfoController.reagentCode}"></p:inputText>

                    <p:outputLabel value="柜号："></p:outputLabel>
                    <p:inputText value="#{opeUseFlowInfoController.containerCode}"></p:inputText>

                    <p:outputLabel value="场所名："></p:outputLabel>
                    <p:inputText value="#{opeUseFlowInfoController.houseName}"></p:inputText>
                    <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>

 src/main/webapp/user_mng.xhtml

@@ -15,16 +15,22 @@
        <p:panel styleClass="center-header">
            <p:outputLabel styleClass="title" value="用户管理"></p:outputLabel>

            <p:panelGrid styleClass="filter" columns="7">
            <p:panelGrid styleClass="filter" columns="11">
                <p:outputLabel value="ARP号："></p:outputLabel>
                <p:inputText value="#{userMngController.arp}"></p:inputText>

                <p:outputLabel value="姓名："></p:outputLabel>
                <p:inputText value="#{userMngController.name}"></p:inputText>

                <p:outputLabel value="课题组："></p:outputLabel>
                <p:inputText value="#{userMngController.project}"></p:inputText>

                <p:outputLabel value="部门："></p:outputLabel>
                <p:inputText value="#{userMngController.departmentName}"></p:inputText>

                <p:outputLabel value="单位："></p:outputLabel>
                <p:inputText value="#{userMngController.company}"></p:inputText>

                <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
            </p:panelGrid>
        </p:panel>

 src/main/webapp/warehouse_stock_mng.xhtml

@@ -79,7 +79,7 @@
            <br/>
            <h:form id="warehouseStockMngForm">
                <p:panel styleClass="center-header">
                    <p:panelGrid styleClass="filter" columns="7">
                    <p:panelGrid styleClass="filter" columns="9">

                        <p:outputLabel value="试剂名称："></p:outputLabel>
                        <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
@@ -91,6 +91,9 @@
                                           var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
                        </p:selectOneMenu>

                        <p:outputLabel value="仓库名："></p:outputLabel>
                        <p:inputText value="#{warehouseStockMngController.warehouseName}"></p:inputText>

                        <p:outputLabel value="产品编号："></p:outputLabel>
                        <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>