申购管理申请履历显示所有历史单据，提交时如有无效试剂耗材报错

李宇

2021-08-18 c3510da29a7974c6af7ff3de1ade3db429d6f848

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

@@ -469,22 +469,22 @@

        if (null != startDate){
            try {
                params.put("startDate",sdfstart.format(startDate));
                params.put("startTime",sdfstart.format(startDate));
            }catch (Exception e){
                e.printStackTrace();
            }
        }else {
            params.put("startDate",sdfstart.format(startTime));
            params.put("startTime",sdfstart.format(startTime));
        }

        if (null != endDate){
            try {
                params.put("endDate",sdfend.format(endDate));
                params.put("endTime",sdfend.format(endDate));
            }catch (Exception e){
                e.printStackTrace();
            }
        }else {
            params.put("endDate",sdfend.format(now));
            params.put("endTime",sdfend.format(now));
        }

        params.put("userId", userId);
@@ -505,6 +505,10 @@
        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate", baseMetas.get(0).getId());

        metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
        List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate1", baseMetas1.get(0).getId());

        addParamByUserId(userId, params);
        return opeUseFlowDao.countPersonalUseInfo(params);
    }
@@ -522,21 +526,21 @@
        Date startTime = cal.getTime();
        if (null != startDate){
            try {
                params.put("startDate",sdfstart.format(startDate));
                params.put("startTime",sdfstart.format(startDate));
            }catch (Exception e){
                e.printStackTrace();
            }
        }else {
            params.put("startDate",sdfstart.format(startTime));
            params.put("startTime",sdfstart.format(startTime));
        }
        if (null != endDate){
            try {
                params.put("endDate",sdfend.format(endDate));
                params.put("endTime",sdfend.format(endDate));
            }catch (Exception e){
                e.printStackTrace();
            }
        }else {
            params.put("endDate",sdfend.format(now));
            params.put("endTime",sdfend.format(now));
        }
        params.put("userId", userId);
        params.put("receiptNumber", receiptNumber);
@@ -551,6 +555,11 @@
        metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate", baseMetas.get(0).getId());

        metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
        List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate1", baseMetas1.get(0).getId());

        params.put("first", first);
        params.put("pageSize", pageSize);

@@ -566,6 +575,11 @@
        metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate", baseMetas.get(0).getId());

        metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
        List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate1", baseMetas1.get(0).getId());

        params.put("receiptNumber", receiptNumber);

        return  opeUseFlowDao.getApplyInfo(params);
@@ -581,6 +595,11 @@
        metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate", baseMetas.get(0).getId());

        metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
        List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate1", baseMetas1.get(0).getId());

        params.put("receiptNumber", receiptNumber);

        return  opeUseFlowDao.getApplyInfoSize(params);
@@ -647,6 +666,10 @@
        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate", baseMetas.get(0).getId());

        metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
        List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
        params.put("operatestate1", baseMetas1.get(0).getId());

        addParamByUserId(userId, params);

        return opeUseFlowDao.selectByReceiptNumber(params);