Merge remote-tracking branch 'origin/master' into master

gdg

2021-01-18 b02535c9a99324823812f6c2d08f066d8e1ba75f

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

@@ -63,6 +63,10 @@
             if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
                 params.put("applyUserId", applyUserId);
             }

                if("连悦".equals(sysUser.getName())){
                    params.remove("applyUserId");
                }
          }

            params.put("approveUserId", approveUserId);
@@ -177,6 +181,10 @@
             if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
                 params.put("applyUserId", applyUserId);
             }

             if("连悦".equals(sysUser.getName())){
                    params.remove("applyUserId");
                }
          }

            params.put("approveUserId", approveUserId);
@@ -511,12 +519,15 @@
   }

    @Override
    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName) {
    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("reagentName", reagentName);
            params.put("personName", personName);
            params.put("userId",id);
            params.put("productSn",productSn);
            params.put("applyCode",applyCode);
            params.put("status",status);
            return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);
@@ -526,7 +537,7 @@
    }
    @Override
    public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
                                                              Integer pageSize) {
                                                              Integer pageSize,String productSn,String applyCode,Integer status) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("reagentName", reagentName);
@@ -534,6 +545,9 @@
            params.put("userId",id);
            params.put("first", first);
            params.put("pageSize", pageSize);
            params.put("productSn",productSn);
            params.put("applyCode",applyCode);
            params.put("status",status);
            return this.opeApplyDao.getOpeApplyReserveListFor(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);