Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platf...

zhaoxiaohao

2021-04-22 d6c989a5d9122e5cf969dd640a92b8e12caf8aa6

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java

@@ -72,6 +72,15 @@
    }

    /**
     * 查看报告
     */
    @Override
    public ResultBody getPdfPathForOperation(String diagnosticId, Integer reportType, Long hospitalId,  Long departId) {
        ResultBody pdfPathForOperation = diagnosticService.getPdfPathForOperation(diagnosticId, reportType, hospitalId, departId);
        return pdfPathForOperation;
    }

    /**
     * 列表
     *
     * @param params
@@ -80,9 +89,21 @@
    @Override
    public PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser) {
        Page<ProductOrderJoinDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
        Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
        params.putAll(roleOrgMap);
//        Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser);
//        params.putAll(roleOrgMap);
        List<ProductOrderJoinDetail> list = baseMapper.findAllList(page, params);
        for (ProductOrderJoinDetail productOrderJoinDetail : list) {
            Date proBegintime = productOrderJoinDetail.getProBegintime();
            Date proEndtime = productOrderJoinDetail.getProEndtime();
            Date nowDate = new Date();
            if(nowDate.getTime()<proBegintime.getTime()){
                productOrderJoinDetail.setUseType("未使用");
            }else if (proBegintime.getTime()<=nowDate.getTime()&&nowDate.getTime()<proEndtime.getTime()){
                productOrderJoinDetail.setUseType("使用中");
            }else if(nowDate.getTime()>=proEndtime.getTime()){
                productOrderJoinDetail.setUseType("已结束");
            }
        }
        return PageResult.<ProductOrderJoinDetail>builder().data(list).code(0).count(page.getTotal()).build();
    }