增加feign客户端调用排除 tenant的注解。 修改完善诊断记录查看的细节问题

侯瑞军

2020-04-28 83715ed7019ab37a4611a2e4e506f84aa1f7b1b0

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

@@ -1,12 +1,16 @@
package com.kidgrow.oprationcenter.controller;

import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -73,12 +77,30 @@
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping("/all")
    public PageResult findAllList(@RequestParam Map<String, Object> params) {
    public PageResult findAllList(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
        if (params.size() == 0) {
            params.put("page", 1);
            params.put("limit", 10);
        }
        return productOrderDetailService.findAllList(params);
        return productOrderDetailService.findAllList(params,sysUser);
    }
    /**
     * 列表
     */
    @ApiOperation(value = "查询列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @PostMapping("/alldata")
    public PageResult findAllDataList(@RequestParam Map<String, Object> params) {
        if (params.size() == 0) {
            params.put("page", 1);
            params.put("limit", 10);
        }
        if(params.get("diagnosticHospitalId")==null)
            return PageResult.<ProductOrderJoinDetail>builder().data(null).code(0).count(0L).build();
        return productOrderDetailService.findAllDataList(params);
    }

    /**
@@ -123,7 +145,7 @@
     */
    @ApiOperation(value = "保存")
    @PostMapping
    public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult) {
    public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult,@LoginUser SysUser sysUser) {
        List<String> errMsg = new ArrayList<>();
        if (bindingResult.hasErrors()) {
            for (ObjectError error : bindingResult.getAllErrors()) {
@@ -131,6 +153,10 @@
            }
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            List<SysOrganization> organizations = sysUser.getOrganizations();
            if(organizations.size()>0){
                productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
            }
            boolean v = productOrderDetailService.saveOrUpdate(productOrderDetail);
            if (v) {
                return ResultBody.ok().data(productOrderDetail).msg("保存成功");
@@ -154,22 +180,17 @@
            }
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            //int v = productOrderDetailService.batchInsert(list);
            for (int i = 0; i < list.size(); i++) {
                if (!productOrderDetailService.saveOrUpdate(list.get(i))) {
                    //写入订单明细失败，则删除订单记录数据
                    Boolean e = productOrderService.removeById(list.get(0).getOrderId());
//                    //删除已写入的订单明细
//                    Map<String, Object> idList = new HashMap<String, Object>();
//                    idList.put("orderId", list.get(i).getOrderId());
//                    boolean delDetail = productOrderDetailService.removeByMap(idList);
                    if (e)
                        return ResultBody.failed().msg("充值数据保存失败，订单已撤回！");
                    else
                        return ResultBody.failed().msg("充值数据保存失败，订单撤回失败！");
                }
            Boolean v = productOrderDetailService.saveBatch(list);
            if (v) {
                return ResultBody.ok().data(list.size()).msg("产品充值成功");
            } else {
                //写入订单明细失败，则删除订单记录数据
                Boolean e = productOrderService.removeById(list.get(0).getOrderId());
                if (e)
                    return ResultBody.failed().msg("充值数据保存失败，订单已撤回！");
                else
                    return ResultBody.failed().msg("充值数据保存失败，订单撤回失败！");
            }
            return ResultBody.ok().data(list.size()).msg("产品充值成功");
        }
    }