审核bug修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZHouseController.java

@@ -112,6 +112,16 @@ public class ZHouseController extends BaseController {
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZHouseBo bo) {
         return toAjax(iZHouseService.updateByBo(bo));
     }
+    /**
+     * 修改房间管理
+     */
+    @SaCheckPermission("zdsz:house:edit")
+    @Log(title = "房间管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/editById")
+    public R<Void> editById( @RequestBody ZHouseBo bo) {
+        return toAjax(iZHouseService.updateByBo(bo));
+    }
 
     /**
      * 删除房间管理

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringInfoBo.java

@@ -126,6 +126,9 @@ public class ZEngineeringInfoBo extends BaseEntity {
     @Valid
     @NotNull(message = "视频不能为空", groups = { AddGroup.class, EditGroup.class })
     public List<String> video;
+    @NotNull(message = "管道施工记录不能为空", groups = { AddGroup.class, EditGroup.class })
+    public List<String> constructionRecords;
+
 
     public List<String> getBeforeBottom() {
         return beforeBottom;

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZHouseBo.java

@@ -35,6 +35,7 @@ public class ZHouseBo extends BaseEntity {
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String areaId;
+
     private String source;
 
     /**
@@ -62,7 +63,9 @@ public class ZHouseBo extends BaseEntity {
     private String remark;
     private String houseUserName;//户主姓名
     private String idCard;//身份证
+
     private String phone;//手机号
+
     private String newPhone;//现主人电话
 
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/enums/photoType.java

@@ -48,6 +48,11 @@ public enum photoType {
     /**
      * 底腿下沟
      */
-    inferiorSulcus;
+    inferiorSulcus,
+    /**
+     * 管道施工记录
+     */
+    constructionRecords
+    ;
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZHouseService.java

@@ -41,6 +41,7 @@ public interface IZHouseService {
      * 修改房间管理
      */
     Boolean updateByBo(ZHouseBo bo);
+    Boolean updateById(String id ,String newPhone);
 
     /**
      * 校验并批量删除房间管理信息

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringInfoServiceImpl.java

@@ -93,6 +93,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             zEngineeringInfoBo1.setBeforeBottom(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.beforeBottom.name()));
             zEngineeringInfoBo1.setLegBackfilling(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.legBackfilling.name()));
             zEngineeringInfoBo1.setInferiorSulcus(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.inferiorSulcus.name()));
+            zEngineeringInfoBo1.setConstructionRecords(izEngiineeringPhotoService.queryTypeList(zEngineeringInfoBo1,photoType.constructionRecords.name()));
             // bo.setId(item.getId());
             ZEngineeringReviewBo zEngineeringReviewbo = izEngineeringReviewService.query(bo);
             zEngineeringInfoBo1.setzEngineeringReviewBo(zEngineeringReviewbo);
@@ -209,6 +210,21 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
 
 
         }
+        if (!ObjectUtils.isEmpty(bo.getConstructionRecords()))
+        {
+            bo.getConstructionRecords().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.constructionRecords.name().toString());
+                photoList.add(zEngiineeringPhoto);
+            });
+
+
+        }
+
         if (!ObjectUtils.isEmpty(bo.getLegBackfilling()))
         {
             bo.getLegBackfilling().forEach(item -> {
@@ -354,6 +370,48 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             izEngiineeringPhotoService.updateBatch(photoList);
         }
         List<ZEngiineeringPhoto> photoList2 = new ArrayList<>();
+        if (!ObjectUtils.isEmpty(bo.getConstructionRecords()))
+        {
+            bo.getConstructionRecords().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.constructionRecords.name().toString());
+                photoList2.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getInferiorSulcus()))
+        {
+            bo.getInferiorSulcus().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.inferiorSulcus.name().toString());
+                photoList2.add(zEngiineeringPhoto);
+            });
+
+
+        }
+        if (!ObjectUtils.isEmpty(bo.getLegBackfilling()))
+        {
+            bo.getLegBackfilling().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.legBackfilling.name().toString());
+                photoList2.add(zEngiineeringPhoto);
+            });
+
+
+        }
         if (!ObjectUtils.isEmpty(bo.getPhotosAfter()))
         {
 
@@ -436,6 +494,20 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             });
 
         }
+        if (!ObjectUtils.isEmpty(bo.getBeforeBottom()))
+        {
+            bo.getBeforeBottom().forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                zEngiineeringPhoto.setParentId(bo.getId());
+                zEngiineeringPhoto.setPicUrl(item);
+                zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                zEngiineeringPhoto.setUpdateTime(new Date());
+                zEngiineeringPhoto.setType(photoType.beforeBottom.name().toString());
+                photoList2.add(zEngiineeringPhoto);
+            });
+
+
+        }
         if (photoList2.size() > 0 ) {
             izEngiineeringPhotoService.updateBatch(photoList2);
         }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZHouseServiceImpl.java

@@ -104,6 +104,14 @@ public class ZHouseServiceImpl implements IZHouseService {
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
+    @Override
+    public Boolean updateById(String id ,String newPhone) {
+        ZHouse update = new ZHouse();
+        update.setId(id);
+        update.setNewPhone(newPhone);
+        return baseMapper.updateById(update) > 0;
+    }
+
 
 
     /**