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

gdg

2021-01-29 d7427ab305dc17af447f5832903691eee329850c

 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);