修改获取列表的bug

zhaoxiaohao

2020-12-02 a42289c269e2c0c89dc9ffd0e82d051d874a5c95

修改获取列表的bug

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderDetailVo.java

@@ -9,4 +9,8 @@
    private Long hospitalId;
    private String departmentName;
    private Long departmentId;
    /**
     * 使用状态
     */
    private String useType;
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java

@@ -109,5 +109,5 @@
     * @param departmentId
     * @return
     */
    List<ProductOrderDetail> departmentProductDetail(Page<ProductOrderDetail> page,@Param("hospitalId") Long hospitalId,@Param("departmentId") Long departmentId);
    List<ProductOrderDetail> departmentProductDetail(Page<ProductOrderDetail> page,@Param("hospitalId") Long hospitalId,@Param("departmentId") Long departmentId,@Param("enabled") Boolean enabled);
}

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

@@ -130,7 +130,7 @@
     * @param params
     * @return
     */
    PageResult<ProductOrderDetail> departmentProductDetail(Map<String, Object> params);
    PageResult<ProductOrderDetailVo> departmentProductDetail(Map<String, Object> params);
    /**
     * 获取最近即将到期的套餐
     * @return

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

@@ -224,11 +224,36 @@
     * @return
     */
    @Override
    public PageResult<ProductOrderDetail> departmentProductDetail(Map<String, Object> params) {
    public PageResult<ProductOrderDetailVo> departmentProductDetail(Map<String, Object> params) {
        Page<ProductOrderDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
        Boolean enabled = MapUtils.getBoolean(params, "enabled");
        if(enabled==null){
            enabled=true;
        }
        List<ProductOrderDetail> list  =
                baseMapper.departmentProductDetail(page, Long.parseLong(params.get("hospitalId").toString()),Long.parseLong(params.get("departmentId").toString()));
        return PageResult.<ProductOrderDetail>builder().data(list).code(0).count(page.getTotal()).build();
                baseMapper.departmentProductDetail(page, Long.parseLong(params.get("hospitalId").toString()),Long.parseLong(params.get("departmentId").toString()),enabled);
        List<ProductOrderDetailVo> listvo = new ArrayList<>();
        for (ProductOrderDetail productOrderDetail : list) {
            ProductOrderDetailVo productOrderDetailVo=new ProductOrderDetailVo();
            BeanCopier beanCopier = BeanCopier.create(ProductOrderDetail.class, ProductOrderDetailVo.class, false);
            beanCopier.copy(productOrderDetail,productOrderDetailVo,null);
            Date proBegintime = productOrderDetailVo.getProBegintime();
            Date proEndtime = productOrderDetailVo.getProEndtime();
            Date nowDate = new Date();
            if(productOrderDetailVo.getEnabled()){
                if(nowDate.getTime()<proBegintime.getTime()){
                    productOrderDetailVo.setUseType("未使用");
                }else if (proBegintime.getTime()<=nowDate.getTime()&&nowDate.getTime()<proEndtime.getTime()){
                    productOrderDetailVo.setUseType("使用中");
                }else if(nowDate.getTime()>=proEndtime.getTime()){
                    productOrderDetailVo.setUseType("已结束");
                }
            }else {
                productOrderDetailVo.setUseType("禁用");
            }
            listvo.add(productOrderDetailVo);
        }
        return PageResult.<ProductOrderDetailVo>builder().data(listvo).code(0).count(page.getTotal()).build();
    }

    @Override

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml

@@ -261,7 +261,9 @@
WHERE
    order_id IN ( SELECT id FROM product_order WHERE hospital_id = #{hospitalId} AND department_id = #{departmentId} AND is_del = 0 AND enabled = 1 )
    AND is_del = 0
    AND enabled = 1
        <if test="enabled!=null">
            and enabled=#{enabled}
        </if>
ORDER BY id DESC
    </select>
    <select id="getUserdProduct" resultType="int">

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html

@@ -157,9 +157,9 @@
                success: function () {
                    table.render({
                        elem: '#contract-table-detail',
                        url: config.base_server + 'api-opration/productorderdetail/alldetail',
                        url: config.base_server + 'api-opration/productorderdetail/all',
                        method: 'GET',
                        where: { hospitalId: data.hospitalId,departmentId:data.departmentId},
                        where: { orderId: data.id,enabled: 1},
                        headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                        page: true,
                        limit: 10,
@@ -167,6 +167,10 @@
                        cols: [[
                            { field: 'proName', width: 300, title: '产品名称' },
                            { field: 'ailightCount', width: 150, title: '读片量' },
                            { field: 'ailightCount', width: 150, title: '读片使用量' ,templet: function (d) {
                                    return d.orderAilightCount-d.ailightCount;
                                }
                            },
                            { field: 'recordCount', width: 100, title: '报告量' },
                            {
                                field: 'isShare', width: 150, title: '是否共享', templet: function (d) {

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html

@@ -119,7 +119,7 @@
                            if(d.orderType==null){
                                return "";
                            }
                            return d.orderType ? "试用" : "正式"
                            return d.orderType ? "正式" : "试用"
                        }
                    },
                    {
@@ -360,6 +360,14 @@
                                    title: '读片量(剩余)'
                                },
                                {
                                    field: 'ailightCount',
                                    width: 150,
                                    title: '读片使用量',
                                    templet: function (d) {
                                        return d.orderAilightCount-d.ailightCount;
                                    }
                                },
                                {
                                    field: 'recordCount',
                                    width: 150,
                                    title: '报告量(剩余)'

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html

@@ -1037,10 +1037,8 @@
                                                    }
                                                }, 'POST');
                                        } else {
                                            layer.msg("充值数据成功！", {
                                                icon: 2,
                                                time: 1000
                                            });
                                            layer.closeAll();
                                            layer.msg("充值数据成功！");
                                            isRun = false;
                                        }
                                    } else {