Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

Administrator

2024-05-23 f5a10d5ae1290d8ceefee143815555d59be6ff9a

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java

@@ -8,6 +8,7 @@
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voIr.VoProject;
import com.dy.pipIrrGlobal.voIr.VoProjectOne;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrIrrigate.result.IrrigateResultCode;
@@ -221,13 +222,11 @@
    })
    @GetMapping(path = "one")
    @SsoAop()
    public BaseResponse<IrProject> one(@RequestParam Long id) {
        IrProject irProject = this.projectSv.selectById(id);
        if (irProject == null) {
            return BaseResponseUtils.buildFail(IrrigateResultCode.NO_PROJECT.getMessage());
        } else {
    public BaseResponse<VoProjectOne> one(@RequestParam Long id) {
        VoProjectOne irProject = this.projectSv.selectById(id);

            return BaseResponseUtils.buildSuccess(irProject);
        }

    }

    /**
@@ -246,12 +245,9 @@
    })
    @GetMapping(path = "some")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoProject>>> getIntakes(QueryVo vo) {
    public BaseResponse<QueryResultVo<List<VoProject>>> getProjects(QueryVo vo) {
        try {
            QueryResultVo<List<VoProject>> res = projectSv.getProjects(vo);
            if (res == null) {
                return BaseResponseUtils.buildFail(IrrigateResultCode.NO_PROJECT.getMessage());
            }
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取项目记录异常", e);