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

liurunyu

2024-07-05 f66dc30060a34526e0603f698aba0e2dfc30f206

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java

@@ -147,7 +147,13 @@
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        List<String> intakeNameList = intakeSv.getIntakeName();
        for (int i = 0; i < intakeNameList.size(); i++) {
            String intakeName = intakeNameList.get(i);
            if (intakeName.equals(po.getName())) {
                return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
            }
        }
        Date operateTime = new Date();
        po.setOperateDt(operateTime);
        po.setDeleted((byte)0);
@@ -179,13 +185,20 @@
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        List<String> intakeNameList = intakeSv.getIntakeName();
        for (int i = 0; i < intakeNameList.size(); i++) {
            String intakeName = intakeNameList.get(i);
            if (intakeName.equals(po.getName())) {
                return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
            }
        }
        int count;
        Date operateTime = new Date();
        po.setOperateDt(operateTime);
        try {
            count = this.intakeSv.update(po);
        } catch (Exception e) {
            log.error("保存分水口异常", e);
            log.error("保存取水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
        if (count <= 0) {