修改 分水房添加接口 村可以为空 分水房修改接口 手机号可以为空

wuzeyu

2024-05-07 9de447f96e739c002a5f7760b67280b6ff81bba3

修改 分水房添加接口 村可以为空  分水房修改接口 手机号可以为空

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrDivide.java

@@ -61,7 +61,7 @@
     */
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    @Schema(description = "所在村ID", requiredMode = Schema.RequiredMode.REQUIRED)
    @NotNull(message = "所在村不能为空")
//    @NotNull(message = "所在村不能为空")
    private Long villageid;

    /**
@@ -104,7 +104,7 @@
     */
    @Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
    //@NotBlank(message = "联系电话不能为空")
    @Length(message = "农联系电话必须{max}位数据", min = 11, max = 11)
    @Length(message = "农联系电话必须{max}位数据",  max = 11)
    private String phone;

    /**

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java

@@ -134,20 +134,21 @@
        // 接收村编号（主键）
        Long villageId = po.getVillageId();

        /**
         * 获取5级行政区划信息
         */
        Map map_districts = Optional.ofNullable(divideSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
        if(map_districts.size() <= 0) {
            return BaseResponseUtils.buildFail("区划信息有误");
        }

        PrDivide prDivide = DtoToDividePojo.INSTANCT.po2vo(po);

        Long countryId = Long.parseLong(map_districts.get("countryId").toString());
        Long townId = Long.parseLong(map_districts.get("townId").toString());
        prDivide.setCountyid(countryId);
        prDivide.setTownid(townId);
        if (villageId!=null){
            /**
             * 获取5级行政区划信息
             */
            Map map_districts = Optional.ofNullable(divideSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
            if(map_districts.size() <= 0) {
                return BaseResponseUtils.buildFail("区划信息有误");
            }
            Long countryId = Long.parseLong(map_districts.get("countryId").toString());
            Long townId = Long.parseLong(map_districts.get("townId").toString());
            prDivide.setCountyid(countryId);
            prDivide.setTownid(townId);
        }

        Date operateTime = new Date();
        prDivide.setOperatedt(operateTime);
@@ -220,19 +221,19 @@
        // 接收村编号（主键）
        Long villageId = po.getVillageid();

        /**
         * 获取5级行政区划信息
         */
        Map map_districts = Optional.ofNullable(divideSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
        if(map_districts.size() <= 0) {
            return BaseResponseUtils.buildFail("区划信息有误");
        if (villageId!=null){
            /**
             * 获取5级行政区划信息
             */
            Map map_districts = Optional.ofNullable(divideSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
            if(map_districts.size() <= 0) {
                return BaseResponseUtils.buildFail("区划信息有误");
            }
            Long countryId = Long.parseLong(map_districts.get("countryId").toString());
            Long townId = Long.parseLong(map_districts.get("townId").toString());
            po.setCountyid(countryId);
            po.setTownid(townId);
        }

        Long countryId = Long.parseLong(map_districts.get("countryId").toString());
        Long townId = Long.parseLong(map_districts.get("townId").toString());

        po.setCountyid(countryId);
        po.setTownid(townId);

        Date operateTime = new Date();
        po.setOperatedt(operateTime);

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DtoDivide.java

@@ -22,7 +22,7 @@
     * 所在村
     */
    @Schema(description = "所在村ID", requiredMode = Schema.RequiredMode.REQUIRED)
    @NotNull(message = "所在村不能为空")
//    @NotNull(message = "所在村不能为空")
    private Long villageId;

    /**