添加 enable过滤

zhaoxiaohao

2020-11-27 9b529709ec63257d1a443651e75f8b0b3f7a8c3e

添加   enable过滤

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java

@@ -452,9 +452,9 @@
        map.put("enabled",true);
        map.put("is_del",false);
        List<ProductOrder> productOrders = productOrderService.listByMap(map);
        IntSummaryStatistics intSummaryStatistics = productOrders.stream().filter(a-> a.getContractNum()!=null).mapToInt((x) -> x.getContractNum()).summaryStatistics();
        Date minDate = productOrders.stream().map(e -> e.getContractBeginTime()).min((e1, e2) -> e1.compareTo(e2)).get();
        Date manDate = productOrders.stream().map(e -> e.getContractEndTime()).max((e1, e2) -> e1.compareTo(e2)).get();
        IntSummaryStatistics intSummaryStatistics = productOrders.stream().filter(a-> a.getContractNum()!=null&&a.getEnabled()).mapToInt((x) -> x.getContractNum()).summaryStatistics();
        Date minDate = productOrders.stream().filter(a->a.getEnabled()).map(e -> e.getContractBeginTime()).min((e1, e2) -> e1.compareTo(e2)).get();
        Date manDate = productOrders.stream().filter(a->a.getEnabled()).map(e -> e.getContractEndTime()).max((e1, e2) -> e1.compareTo(e2)).get();
        map = new HashMap<>();
        map.put("count", intSummaryStatistics.getSum());
        map.put("beginTime",DateUtils.formatDate(minDate,"yyyy-MM-dd HH:mm:ss"));

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

@@ -534,6 +534,17 @@
                }
            });
        }
        //获取软件的服务周期
        var getCycleTime = function (departmentId) {
            admin.req('api-opration/productorderdetail/getContractBeginEndTimeAndNum', { departmentId: departmentId },
                function (data) {
                    if (data.code == 0) {
                        $("#contractBeginTime").val(layui.util.toDateString(data.data.beginTime, "yyyy-MM-dd"));
                        $("#contractEndTime").val(layui.util.toDateString(data.data.endTime, "yyyy-MM-dd"));
                    }

                }, "get")
        }

        //回显医院基本数据
        let hospitalData = admin.getTempData('t_hospital');
@@ -557,6 +568,7 @@
                            form.val('recharge-form', hospitalData);
                            //限制时间
                            xianzhi();
                            getCycleTime();
                            getHospitalAddress(hospitalData.hospitalId);
                            //装载产品数据
                            table.render({