申购人使用表格

lyfO_o

2021-07-14 843ca99dda413de8874f4bda2d4ed73205cd4728

 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);
@@ -501,9 +501,9 @@
        //操作状态位仓库领取
        Map<String, String> metaMap2 = new HashMap<>();
        metaMap2.put("groupId", "operate_status");
        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.WAREHOUSEOUT.getKey()));
//        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
//        params.put("operatestate", baseMetas.get(0).getId());

        addParamByUserId(userId, params);
        return opeUseFlowDao.countPersonalUseInfo(params);
@@ -522,21 +522,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);
@@ -548,9 +548,9 @@
        //操作状态位仓库领取
        Map<String, String> metaMap2 = new HashMap<>();
        metaMap2.put("groupId", "operate_status");
        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.WAREHOUSEOUT.getKey()));
//        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
//        params.put("operatestate", baseMetas.get(0).getId());
        params.put("first", first);
        params.put("pageSize", pageSize);

@@ -563,9 +563,9 @@
        Map<String,Object> params = new HashMap<>();
        Map<String, String> metaMap2 = new HashMap<>();
        metaMap2.put("groupId", "operate_status");
        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.WAREHOUSEOUT.getKey()));
//        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
//        params.put("operatestate", baseMetas.get(0).getId());
        params.put("receiptNumber", receiptNumber);

        return  opeUseFlowDao.getApplyInfo(params);
@@ -643,9 +643,9 @@
        //操作状态位仓库领取
        Map<String, String> metaMap2 = new HashMap<>();
        metaMap2.put("groupId", "operate_status");
        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.WAREHOUSEOUT.getKey()));
//        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
//        params.put("operatestate", baseMetas.get(0).getId());

        addParamByUserId(userId, params);