Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

houruijun

2020-07-21 77dbb85286de0ec52d8144bb7c89483c2909a07e

Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

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

New file
@@ -0,0 +1,12 @@
package com.kidgrow.oprationcenter.vo;

import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import lombok.Data;

@Data
public class ProductOrderDetailVo extends ProductOrderDetail {
    private String hospitalName;
    private Long hospitalId;
    private String departmentName;
    private Long departmentId;
}

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

@@ -72,5 +72,7 @@

    ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
    ResultBody UserProductDetailData(Long hospitalId,Long departmentId);

    PageResult all(Map<String, Object> params);
}


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

@@ -9,9 +9,12 @@
import com.kidgrow.oprationcenter.feign.DiagnosticService;
import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderMapper;
import com.kidgrow.oprationcenter.model.ConsumptionRecord;
import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.*;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.feign.SysHospitalService;
@@ -19,6 +22,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service;

import java.util.*;
@@ -43,6 +47,8 @@
    private SysHospitalService sysHospitalService;
    @Autowired
    private ConsumptionRecordMapper consumptionRecordMapper;
    @Autowired
    private IProductOrderService iProductOrderService;
    /**
     * 列表
     * @param params
@@ -88,6 +94,31 @@
        }
        return ResultBody.ok().data(userProductData);
    }

    @Override
    public PageResult all(Map<String, Object> params) {
        Page<ProductOrderDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
        List<ProductOrderDetail> list  =  baseMapper.findList(page, params);
        List<ProductOrderDetailVo> volist=new ArrayList<>();
        for (ProductOrderDetail productOrderDetail : list) {
            ProductOrderDetailVo productOrderDetailVo=new ProductOrderDetailVo();
            BeanCopier beanCopier = BeanCopier.create(ProductOrderDetail.class, ProductOrderDetailVo.class, false);
            beanCopier.copy(productOrderDetail,productOrderDetailVo,null);
            //查询医院
            if(productOrderDetail.getOrderId()!=null){
                ProductOrder productOrder = iProductOrderService.getById(productOrderDetail.getOrderId());
                if(productOrder!=null){
                    productOrderDetailVo.setDepartmentId(productOrder.getDepartmentId());
                    productOrderDetailVo.setDepartmentName(productOrder.getDepartmentName());
                    productOrderDetailVo.setHospitalId(productOrder.getHospitalId());
                    productOrderDetailVo.setHospitalName(productOrder.getHospitalName());
                }
               volist.add(productOrderDetailVo);
            }
        }
        return PageResult.<ProductOrderDetailVo>builder().data(volist).code(0).count(page.getTotal()).build();
    }

    /**
     * 获取诊断列表
     * @param params

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

@@ -69,7 +69,22 @@
        }
        return productOrderDetailService.findList(params);
    }

    /**
     * 列表
     */
    @ApiOperation(value = "查询列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping("all")
    public PageResult all(@RequestParam Map<String, Object> params) {
        if (params.size() == 0) {
            params.put("page", 1);
            params.put("limit", 10);
        }
        return productOrderDetailService.all(params);
    }
    /**
     * 列表
     */

 kidgrow-config/src/main/resources/application-dev.properties

@@ -54,5 +54,5 @@
kidgrow.audit-log.datasource.username=${kidgrow.datasource.username}
kidgrow.audit-log.datasource.password=${kidgrow.datasource.password}

##  appUrl  ¾²Ì¬ÎļþµØÖ·
##  appUrl \u9759\u6001\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84
appUrl=http://192.168.2.240/upload/

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

@@ -118,7 +118,7 @@
                { field: 'templeteTitle', width: 180, sort: true, title: '标题' },
                {
                    field: 'publicType', width: 200, sort: true, title: '开放类型', templet: function (d) {
                        return d.publicType ==true ? "公开" : "私有"
                        return d.publicType ==true ? "私有" : "公开"
                    }
                },
                {