bug修改

无关风月

2025-02-28 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99

 manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java

@@ -4,24 +4,22 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.model.TAppUser;
import com.jilongda.manage.model.TOptometryDetail;
import com.jilongda.manage.model.TSupplier;
import com.jilongda.manage.model.*;
import com.jilongda.manage.query.TOptometryQuery;
import com.jilongda.manage.query.TSupplierQuery;
import com.jilongda.manage.service.TAppUserService;
import com.jilongda.manage.service.TOptometristService;
import com.jilongda.manage.service.TOptometryDetailService;
import com.jilongda.manage.service.TSupplierService;
import com.jilongda.manage.service.*;
import com.jilongda.manage.vo.TOptometryDetailVO;
import com.jilongda.manage.vo.TOptometryVO;
import com.jilongda.manage.vo.TSupplierVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -42,6 +40,10 @@
    private TOptometryDetailService optometryDetailService;
    @Autowired
    private TAppUserService appUserService;
    @Autowired
    private TOptometryService optometryService;
    @Autowired
    private TStoreService storeService;

    /**
     * 获取供应商列表
@@ -61,6 +63,11 @@
        PageInfo<TOptometryVO> tOptometryVOPageInfo = optometristService.pageList(query);
        List<TOptometryVO> records = tOptometryVOPageInfo.getRecords();
        for (TOptometryVO record : records) {
            List<TOptometryDetail> list = optometryDetailService.lambdaQuery()
                    .eq(TOptometryDetail::getOptometryId, record.getId())
                    .eq(TOptometryDetail::getType,1)
                    .list();
            record.setList(list);
            if (record.getUserId()!=null){
                TAppUser byId = appUserService.getById(record.getUserId());
                if (byId!=null){
@@ -94,11 +101,34 @@
    }
    @ApiOperation(value = "查询验光单详情",tags = "验光单")
    @GetMapping(value = "/getDetailById")
    public ApiResult<List<TOptometryDetail>> getDetailById(@RequestParam Integer id) {
    public ApiResult<TOptometryDetailVO> getDetailById(@RequestParam Integer id) {

        TOptometryDetailVO tOptometryDetailVO = new TOptometryDetailVO();

        TOptometry optometry = optometryService.getById(id);
        tOptometryDetailVO.setOptometryTime(optometry.getCreateTime());
        tOptometryDetailVO.setOptometry(optometry);
        // 查询用户信息
//        TAppUser appUser = appUserService.getById(optometry.getUserId());
//        tOptometryDetailVO.setAppUser(appUser);

        // 查询验光师信息
        TOptometrist optometrist = optometristService.getById(optometry.getOptometristId());
        if(Objects.nonNull(optometrist)){
            tOptometryDetailVO.setOptometristName(optometrist.getName());
            // 查询门店信息
            TStore store = storeService.getById(optometrist.getStoreId());
            if(Objects.nonNull(store)){
                tOptometryDetailVO.setStoreName(store.getName());
            }
        }

        // 验光单详情
        List<TOptometryDetail> list = optometryDetailService.lambdaQuery()
                .eq(TOptometryDetail::getOptometryId, id)
                .list();
        return ApiResult.success(list);
        tOptometryDetailVO.setOptometryDetails(list);
        return ApiResult.success(tOptometryDetailVO);
    }
}