pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -9,6 +9,7 @@
import com.dy.pipIrrGlobal.excel.CellWriteHandler;
import com.dy.pipIrrGlobal.excel.ExcelUtil;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
@@ -75,9 +76,9 @@
    })
    @GetMapping(path = "all")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<PrIntake>>> all() {
    public BaseResponse<QueryResultVo<List<VoAllIntake>>> all() {
        try {
            QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll();
            QueryResultVo<List<VoAllIntake>> res = this.intakeSv.selectAll();
            if (res == null) {
                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
            } else {
@@ -103,9 +104,9 @@
                            schema = @Schema(implementation = PrIntake.class))}
            )
    })
    @GetMapping(path = "one/{id}")
    @GetMapping(path = "one")
    @SsoAop()
    public BaseResponse<PrIntake> one(@PathVariable("id") Long id) {
    public BaseResponse<VoAllIntake> one(@RequestParam("id") Long id) {
        if (this.intakeSv.selectById(id) == null) {
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
        } else {