sinake
3 天以前 9eec4efbeefb83b2e1b7e363899b5fdc17eda501
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -14,9 +14,11 @@
import com.ruoyi.project.common.IdGeneratorUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
import com.ruoyi.project.domain.ServiceTransport;
import com.ruoyi.project.domain.VUserOrg;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportService;
import com.ruoyi.project.service.IServiceTransportService;
import com.ruoyi.project.service.IVUserOrgService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
@@ -26,6 +28,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,6 +50,9 @@
    private ISysConfigService sysConfigService;
    @Autowired
    private IVUserOrgService vUserOrgService;
    @Autowired
    private IServiceTransportService serviceTransport;
    /**
     * 查询捐献上报基础列表
@@ -103,6 +109,10 @@
        serviceDonatebaseinfoReportFile.setDelFlag(0);
        List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles = serviceDonatebaseinfoReportFileService.queryList(serviceDonatebaseinfoReportFile);
        serviceDonatebaseinfoReport.setAnnexfilesList(serviceDonatebaseinfoReportFiles);
        Map<String,Object> transportMap=new HashMap<>();
        transportMap.put("report_id",serviceDonatebaseinfoReport.getId());
        List<ServiceTransport> transports= serviceTransport.listByMap(transportMap);
        serviceDonatebaseinfoReport.setServiceTransport(transports);
        return AjaxResult.success(serviceDonatebaseinfoReport);
    }