Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

# Conflicts:
#	ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

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

@@ -247,6 +247,19 @@ public class ZEngineeringDangerousBo extends BaseEntity {
 
     private List<ZEngiineeringPhotoVo> pics;
 
+
+    public List<ZFileBo> getFiles() {
+        return files;
+    }
+
+    public void setFiles(List<ZFileBo> files) {
+        this.files = files;
+    }
+
+    private List<ZFileBo> files;
+
+
+
     public List<ZEngiineeringPhotoVo> getPics() {
         return pics;
     }

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

@@ -23,73 +23,61 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     /**
      *
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
 
     /**
      * 工程类型
      */
-    @NotBlank(message = "工程类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginType;
 
     /**
      * 建筑单位
      */
-    @NotBlank(message = "建筑单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructUnit;
 
     /**
      * 项目负责人
      */
-    @NotBlank(message = "项目负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String projectHead;
 
     /**
      * 现场负责人
      */
-    @NotBlank(message = "现场负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sceneHead;
 
     /**
      * 设计单位
      */
-    @NotBlank(message = "设计单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String designUnit;
 
     /**
      * 设计负责人
      */
-    @NotBlank(message = "设计负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String designHead;
 
     /**
      * 设计联系电话
      */
-    @NotBlank(message = "设计联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String designPhone;
 
     /**
      * 监理单位
      */
-    @NotBlank(message = "监理单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supervisionUnit;
 
     /**
      * 监理负责人
      */
-    @NotBlank(message = "监理负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supervisionHead;
 
     /**
      * 监理联系电话
      */
-    @NotBlank(message = "监理联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supervisionPhone;
 
     /**
      * 工程名称
      */
-    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginName;
 
     /**
@@ -100,7 +88,6 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     /**
      * 类型(工业工程|市政工程)
      */
-    @NotBlank(message = "类型(工业工程|市政工程)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     private ZEngineeringNodeBo zEngineeringNodeBo;

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

@@ -10,9 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.framework.obs.FileUtil;
 import com.ruoyi.system.mapper.SysDictDataMapper;
-import com.ruoyi.zdsz.domain.ZBuilding;
-import com.ruoyi.zdsz.domain.ZHouse;
-import com.ruoyi.zdsz.domain.ZUnit;
+import com.ruoyi.zdsz.domain.*;
 import com.ruoyi.zdsz.domain.vo.GExportsVo;
 import com.ruoyi.zdsz.domain.vo.GImportVo;
 import com.ruoyi.zdsz.mapper.ZBuildingMapper;
@@ -27,7 +25,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZAreaBo;
 import com.ruoyi.zdsz.domain.vo.ZAreaVo;
-import com.ruoyi.zdsz.domain.ZArea;
 import com.ruoyi.zdsz.mapper.ZAreaMapper;
 import com.ruoyi.zdsz.service.IZAreaService;
 import org.springframework.util.ObjectUtils;
@@ -284,6 +281,7 @@ public class ZAreaServiceImpl implements IZAreaService {
     private LambdaQueryWrapper<ZArea> buildQueryWrapper(ZAreaBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZArea> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZArea::getCreateTime);
         lqw.like(StringUtils.isNotBlank(bo.getName()), ZArea::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getScale()), ZArea::getScale, bo.getScale());
         lqw.eq(bo.getReleaseIs() != null, ZArea::getReleaseIs, bo.getReleaseIs());

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.ZArea;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
@@ -45,6 +46,7 @@ public class ZBuildingServiceImpl implements IZBuildingService {
     @Override
     public int getBuildingListByAreaId(Collection<String> ids) {
         LambdaQueryWrapper<ZBuilding> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZBuilding::getCreateTime);
         lqw.in(!ids.isEmpty(), ZBuilding::getAreaId, ids);
         return baseMapper.selectVoList(lqw).size();
     }
@@ -79,6 +81,7 @@ public class ZBuildingServiceImpl implements IZBuildingService {
     private LambdaQueryWrapper<ZBuilding> buildQueryWrapper(ZBuildingBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZBuilding> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZBuilding::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZBuilding::getAreaId, bo.getAreaId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), ZBuilding::getName, bo.getName());
         return lqw;

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

@@ -89,6 +89,7 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
     private LambdaQueryWrapper<ZComprehensive> buildQueryWrapper(ZComprehensiveBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZComprehensive> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZComprehensive::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZComprehensive::getAreaId, bo.getAreaId());
         lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZComprehensive::getBuildingId, bo.getBuildingId());
         lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZComprehensive::getUnitId, bo.getUnitId());

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

@@ -59,6 +59,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     public List<String> queryList(ZEngineeringInfoBo bo) {
         List<String> list = new ArrayList<>();
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngiineeringPhoto::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngiineeringPhoto::getParentId, bo.getId()).orderByDesc(ZEngiineeringPhoto::getCreateTime);
         List<ZEngiineeringPhoto> zEngiineeringPhotoList = baseMapper.selectList(lqw);
         zEngiineeringPhotoList.stream().forEach(item -> {
@@ -89,6 +90,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     private LambdaQueryWrapper<ZEngiineeringPhoto> buildQueryWrapper(ZEngiineeringPhotoBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngiineeringPhoto::getUpdateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getParentId()), ZEngiineeringPhoto::getParentId, bo.getParentId());
         lqw.eq(StringUtils.isNotBlank(bo.getPicUrl()), ZEngiineeringPhoto::getPicUrl, bo.getPicUrl());
         return lqw;

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.ZEngineeringMaterialsResets;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
@@ -61,6 +62,7 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
     private LambdaQueryWrapper<ZEnginMaterialQuality> buildQueryWrapper(ZEnginMaterialQualityBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEnginMaterialQuality> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEnginMaterialQuality::getCreateTime);
         lqw.like(StringUtils.isNotBlank(bo.getEnginType()), ZEnginMaterialQuality::getEnginType, bo.getEnginType());
         lqw.like(StringUtils.isNotBlank(bo.getName()), ZEnginMaterialQuality::getName, bo.getName());
         return lqw;

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

@@ -63,6 +63,7 @@ public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsSer
     private LambdaQueryWrapper<ZEnginSpecifications> buildQueryWrapper(ZEnginSpecificationsBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEnginSpecifications> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEnginSpecifications::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getMaterId()), ZEnginSpecifications::getMaterId, bo.getMaterId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), ZEnginSpecifications::getName, bo.getName());
         return lqw;

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

@@ -92,6 +92,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
     private LambdaQueryWrapper<ZEngineeringDangerous> buildQueryWrapper(ZEngineeringDangerousBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringDangerous> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringDangerous::getCreateTime);
         lqw.like(StringUtils.isNotBlank(bo.getBasicInformation()), ZEngineeringDangerous::getBasicInformation, bo.getBasicInformation());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringDangerous::getEnginName, bo.getEnginName());
         lqw.like(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringDangerous::getEnginAddre, bo.getEnginAddre());
@@ -117,15 +118,17 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         ZEngineeringNode entity = izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
         if (!ObjectUtil.isEmpty(entity)) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
-            bo.getPics().stream().forEach(o -> {
-                ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
-                pic.setParentId(bo.getId());
-                pic.setPicUrl(o.getPicUrl());
-                pic.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
-                pic.setUpdateTime(new Date());
-                pic.setCreateTime(bo.getCreateTime());
-                list.add(pic);
-            });
+            if (!ObjectUtils.isEmpty(bo.getFiles())) {
+                bo.getFiles().stream().forEach(o -> {
+                    ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
+                    pic.setParentId(bo.getId());
+                    pic.setPicUrl(o.getUrl());
+                    pic.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
+                    pic.setUpdateTime(new Date());
+                    pic.setCreateTime(bo.getCreateTime());
+                    list.add(pic);
+                });
+            }
             if (!list.isEmpty()) {
                 photoService.insertBatch(list);
             }
@@ -152,34 +155,40 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         if (i > 0) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
 
-            // 查询数据库中已存在的文件列表
-            ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
-            bo1.setParentId(update.getId());
-            List<String> existingPhotos = photoService.queryList(bo1).stream()
-                .map(ZEngiineeringPhotoVo::getPicUrl)
-                .collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(bo.getFiles())) {
+                // 查询数据库中已存在的文件列表
+                ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
+                bo1.setParentId(update.getId());
+                List<String> existingPhotos = photoService.queryList(bo1).stream()
+                    .map(ZEngiineeringPhotoVo::getPicUrl)
+                    .collect(Collectors.toList());
 
-            // 插入前端传来的新文件
-            for (ZEngiineeringPhotoVo pic : bo.getPics()) {
-                if (!existingPhotos.contains(pic.getPicUrl())) {
-                    ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
-                    newPhoto.setParentId(bo.getId());
-                    newPhoto.setPicUrl(pic.getPicUrl());
-                    newPhoto.setFileName(pic.getFileName());
-                    newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
-                    newPhoto.setCreateTime(new Date());
-                    list.add(newPhoto);
+                for (ZFileBo pic : bo.getFiles()) {
+                    if (!existingPhotos.contains(pic.getUrl())) {
+                        ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
+                        newPhoto.setParentId(bo.getId());
+                        newPhoto.setPicUrl(pic.getUrl());
+                        newPhoto.setFileName(pic.getName());
+                        newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
+                        newPhoto.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
+                        newPhoto.setCreateTime(bo.getCreateTime());
+                        newPhoto.setUpdateTime(new Date());
+                        list.add(newPhoto);
+                    }
                 }
-            }
 
-            // 删除数据库中多余的文件
-            List<String> photosToDelete = existingPhotos.stream()
-                .filter(pic -> !bo.getPics().stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList()).contains(pic))
-                .collect(Collectors.toList());
-            if (!photosToDelete.isEmpty()) {
-                photosToDelete.forEach(item -> {
-                    photoService.deleteWithValidByurls(item);
-                });
+                // 删除数据库中多余的文件
+                List<String> photosToDelete = existingPhotos.stream()
+                    .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
+                    .collect(Collectors.toList());
+                if (!photosToDelete.isEmpty()) {
+                    photosToDelete.forEach(item->{
+                        ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+                        zEngiineeringPhoto.setPicUrl(item);
+                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                        photoService.deleteWithValid(zEngiineeringPhoto);
+                    });
+                }
             }
 
             // 批量插入新图片
@@ -285,12 +294,12 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                 .collect(Collectors.toList());
 
             // 插入前端传来的新文件
-            for (ZEngiineeringPhotoVo pic : bo.getPics()) {
-                if (!existingPhotos.contains(pic.getPicUrl())) {
+            for (ZFileBo pic : bo.getFiles()) {
+                if (!existingPhotos.contains(pic.getUrl())) {
                     ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
-                    newPhoto.setParentId(bo.getId());
-                    newPhoto.setPicUrl(pic.getPicUrl());
-                    newPhoto.setFileName(pic.getFileName());
+                    newPhoto.setParentId(update.getId());
+                    newPhoto.setPicUrl(pic.getUrl());
+                    newPhoto.setFileName(pic.getName());
                     newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
                     newPhoto.setUpdateBy(String.valueOf(LoginHelper.getUsername()));
                     newPhoto.setCreateTime(bo.getCreateTime());

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

@@ -50,6 +50,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
 
     @Resource
     private IZEngiineeringPhotoService photoService;
+
     /**
      * 查询工业工程|市政工程
      */
@@ -91,6 +92,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
 
     private LambdaQueryWrapper<ZEngineeringIndustry> buildQueryWrapper(ZEngineeringIndustryBo bo) {
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringIndustry::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
@@ -119,7 +121,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         if (flag) {
             bo.setId(add.getId());
             List<ZEngiineeringPhoto> list = new ArrayList<>();
-            bo.getFiles().forEach(o->{
+            bo.getFiles().forEach(o -> {
                 ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
                 pic.setParentId(bo.getId());
                 pic.setPicUrl(o.getUrl());
@@ -132,9 +134,11 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 photoService.insertBatch(list);
             }
         }
-        bo.getzEngineeringNodeBo().setCivliId(add.getId());
-        bo.getzEngineeringNodeBo().setCreateTime(new Date());
-        izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
+        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+            bo.getzEngineeringNodeBo().setCivliId(add.getId());
+            bo.getzEngineeringNodeBo().setCreateTime(new Date());
+            izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
+        }
         return flag;
     }
 
@@ -147,17 +151,15 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         validEntityBeforeSave(update);
         boolean flag = baseMapper.updateById(update) > 0;
-        if (flag){
+        if (flag) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
             // 查询数据库中已存在的文件列表
             ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
             zEngiineeringPhotoBo.setParentId(update.getId());
             zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
-            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream()
-                .map(ZEngiineeringPhotoVo::getPicUrl)
-                .collect(Collectors.toList());
+            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
             // 插入前端传来的新文件
-            if (!ObjectUtils.isEmpty(bo.getFiles())){
+            if (!ObjectUtils.isEmpty(bo.getFiles())) {
                 for (ZFileBo pic : bo.getFiles()) {
                     if (!existingPhotos.contains(pic.getUrl())) {
                         ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
@@ -171,12 +173,10 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     }
                 }
                 // 删除数据库中多余的文件
-                List<String> photosToDelete = existingPhotos.stream()
-                    .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
-                    .collect(Collectors.toList());
+                List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic)).collect(Collectors.toList());
                 if (!photosToDelete.isEmpty()) {
-                    photosToDelete.forEach(item->{
-                        ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+                    photosToDelete.forEach(item -> {
+                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
                         zEngiineeringPhoto.setPicUrl(item);
                         zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
                         photoService.deleteWithValid(zEngiineeringPhoto);
@@ -211,15 +211,13 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     public Boolean updateNodeByBo(ZEngineeringIndustryBo bo) {
         ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
         boolean flag = baseMapper.updateById(update) > 0;
-        if (flag){
-            if (!ObjectUtils.isEmpty(bo.getFiles())){
+        if (flag) {
+            if (!ObjectUtils.isEmpty(bo.getFiles())) {
                 List<ZEngiineeringPhoto> list = new ArrayList<>();
                 // 查询数据库中已存在的文件列表
                 ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
                 zEngiineeringPhotoBo.setParentId(update.getId());
-                List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream()
-                    .map(ZEngiineeringPhotoVo::getPicUrl)
-                    .collect(Collectors.toList());
+                List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
                 // 插入前端传来的新文件
                 for (ZFileBo pic : bo.getFiles()) {
                     if (!existingPhotos.contains(pic.getUrl())) {
@@ -234,12 +232,10 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     }
                 }
                 // 删除数据库中多余的文件
-                List<String> photosToDelete = existingPhotos.stream()
-                    .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
-                    .collect(Collectors.toList());
+                List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic)).collect(Collectors.toList());
                 if (!photosToDelete.isEmpty()) {
-                    photosToDelete.forEach(item->{
-                        ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+                    photosToDelete.forEach(item -> {
+                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
                         zEngiineeringPhoto.setPicUrl(item);
                         zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
                         photoService.deleteWithValid(zEngiineeringPhoto);
@@ -251,16 +247,18 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 }
             }
         }
-        List<ZEngineeringInfoBo> engineeringInfoBoList1 = bo.getzEngineeringNodeBo().getzEngineeringInfoBoList();
-        if (engineeringInfoBoList1!=null&&!engineeringInfoBoList1.isEmpty()){
+        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())){
+            List<ZEngineeringInfoBo> engineeringInfoBoList1 = bo.getzEngineeringNodeBo().getzEngineeringInfoBoList();
+            if (engineeringInfoBoList1 != null && !engineeringInfoBoList1.isEmpty()) {
                 nodeService.updateMuch(bo.getzEngineeringNodeBo());
+            }
         }
-//        bo.getzEngineeringNodeBoList().stream().forEach(item->{
-//            item.setCivliId(bo.getId());
-//            item.setCreateTime(bo.getCreateTime());
-//            item.setType(bo.getType());
-//            izEngineeringNodeService.updateMuch(item);
-//        });
+        //        bo.getzEngineeringNodeBoList().stream().forEach(item->{
+        //            item.setCivliId(bo.getId());
+        //            item.setCreateTime(bo.getCreateTime());
+        //            item.setType(bo.getType());
+        //            izEngineeringNodeService.updateMuch(item);
+        //        });
         return flag;
     }
 
@@ -284,12 +282,10 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
             zEngiineeringPhotoBo.setParentId(item);
             // 将查询出的url放入existingPhotos
-            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream()
-                .map(ZEngiineeringPhotoVo::getPicUrl)
-                .collect(Collectors.toList());
+            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
             // 若存在 则进行删除
             if (!existingPhotos.isEmpty()) {
-                existingPhotos.forEach(i->{
+                existingPhotos.forEach(i -> {
                     photoService.deleteWithValidByurls(i);
                 });
             }
@@ -301,10 +297,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
             //  查询数据库中已存在的工程节点
             List<ZEngineeringNodeBo> zEngineeringNodeBos = nodeService.queryListDetails(zEngineeringNodeBo);
             // 若存在 则进行删除
-            if (!zEngineeringNodeBos.isEmpty()){
-                zEngineeringNodeBos.forEach(ite ->
-                    nodeService.delete(ite)
-                );
+            if (!zEngineeringNodeBos.isEmpty()) {
+                zEngineeringNodeBos.forEach(ite -> nodeService.delete(ite));
             }
         });
         return baseMapper.deleteBatchIds(ids) > 0;
@@ -323,16 +317,16 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     @Override
     public List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringIndustryBo bo) {
         LambdaQueryWrapper<ZEngineeringIndustry> zEngineeringIndustryBoLambdaQueryWrapper = buildListByType(bo);
+        zEngineeringIndustryBoLambdaQueryWrapper.orderByDesc(ZEngineeringIndustry::getCreateTime);
         List<ZEngineeringIndustry> zEngineeringIndustryVos = baseMapper.selectList(zEngineeringIndustryBoLambdaQueryWrapper);
-        List<ZEngineeringIndustryTypeVo> zEngineeringIndustryTypeVos = zEngineeringIndustryVos.stream()
-            .map(ZEngineeringIndustryTypeVo::new)
-            .collect(Collectors.toList());
+        List<ZEngineeringIndustryTypeVo> zEngineeringIndustryTypeVos = zEngineeringIndustryVos.stream().map(ZEngineeringIndustryTypeVo::new).collect(Collectors.toList());
         return zEngineeringIndustryTypeVos;
     }
 
     private LambdaQueryWrapper<ZEngineeringIndustry> buildListByType(ZEngineeringIndustryBo bo) {
 
         LambdaQueryWrapper<ZEngineeringIndustry> queryWrapper = new LambdaQueryWrapper<ZEngineeringIndustry>();
+        queryWrapper.orderByDesc(ZEngineeringIndustry::getCreateTime);
         queryWrapper.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
         queryWrapper.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringIndustry::getType, bo.getType());
         if (!"null".equals(bo.getEnginClassification())) {

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

@@ -119,6 +119,7 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
     private LambdaQueryWrapper<ZEngineeringInfrastructure> buildQueryWrapper(ZEngineeringInfrastructureBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringInfrastructure> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringInfrastructure::getCreateTime);
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringInfrastructure::getEnginName, bo.getEnginName());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringInfrastructure::getEnginAddre, bo.getEnginAddre());
         lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringInfrastructure::getConstructUnit, bo.getConstructUnit());

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

@@ -104,6 +104,7 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
     private LambdaQueryWrapper<ZEngineeringMaterial> buildQueryWrapper(ZEngineeringMaterialBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringMaterial> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringMaterial::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getDetailsId()), ZEngineeringMaterial::getDetailsId, bo.getDetailsId());
         lqw.eq(StringUtils.isNotBlank(bo.getCorrosionLevel()), ZEngineeringMaterial::getCorrosionLevel, bo.getCorrosionLevel());
         lqw.eq(StringUtils.isNotBlank(bo.getBrand()), ZEngineeringMaterial::getBrand, bo.getBrand());

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

@@ -67,6 +67,7 @@ public class ZEngineeringMaterialsResetsServiceImpl implements IZEngineeringMate
     private LambdaQueryWrapper<ZEngineeringMaterialsResets> buildQueryWrapper(ZEngineeringMaterialsResetsBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringMaterialsResets> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringMaterialsResets::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringMaterialsResets::getAreaId, bo.getAreaId());
         lqw.eq(StringUtils.isNotBlank(bo.getMaterialQuality()), ZEngineeringMaterialsResets::getMaterialQuality, bo.getMaterialQuality());
         lqw.eq(StringUtils.isNotBlank(bo.getEstimatedSpecifications()), ZEngineeringMaterialsResets::getEstimatedSpecifications, bo.getEstimatedSpecifications());
@@ -121,6 +122,7 @@ public class ZEngineeringMaterialsResetsServiceImpl implements IZEngineeringMate
     @Override
     public int getMaterialByAreaId(Collection<String> ids) {
         LambdaQueryWrapper<ZEngineeringMaterialsResets> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringMaterialsResets::getCreateTime);
         lqw.in(!ids.isEmpty(), ZEngineeringMaterialsResets::getAreaId, ids);
         return baseMapper.selectVoList(lqw).size();
     }

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

@@ -112,6 +112,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     private LambdaQueryWrapper<ZEngineeringPipeJacking> buildQueryWrapper(ZEngineeringPipeJackingBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringPipeJacking::getCreateTime);
         lqw.like(StringUtils.isNotBlank(bo.getEnginId()), ZEngineeringPipeJacking::getEnginId, bo.getEnginId());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringPipeJacking::getEnginName, bo.getEnginName());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringPipeJacking::getEnginAddre, bo.getEnginAddre());

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

@@ -67,6 +67,7 @@ public class ZHouseServiceImpl implements IZHouseService {
     private LambdaQueryWrapper<ZHouse> buildQueryWrapper(ZHouseBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZHouse> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZHouse::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZHouse::getAreaId, bo.getAreaId());
         lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZHouse::getBuildingId, bo.getBuildingId());
         lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZHouse::getUnitId, bo.getUnitId());
@@ -119,6 +120,7 @@ public class ZHouseServiceImpl implements IZHouseService {
     @Override
     public int getHouseByUnitId(Collection<String> ids) {
         LambdaQueryWrapper<ZHouse> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZHouse::getCreateTime);
         lqw.in(!ids.isEmpty(), ZHouse::getUnitId, ids);
         return baseMapper.selectVoList(lqw).size();
     }

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

@@ -69,6 +69,7 @@ public class ZUnitServiceImpl implements IZUnitService {
     private LambdaQueryWrapper<ZUnit> buildQueryWrapper(ZUnitBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZUnit> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZUnit::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZUnit::getAreaId, bo.getAreaId());
         lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZUnit::getBuildingId, bo.getBuildingId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), ZUnit::getName, bo.getName());
@@ -120,6 +121,7 @@ public class ZUnitServiceImpl implements IZUnitService {
     @Override
     public int getListByUnitId(Collection<String> ids) {
         LambdaQueryWrapper<ZUnit> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZUnit::getCreateTime);
         lqw.in(!ids.isEmpty(), ZUnit::getBuildingId, ids);
         return baseMapper.selectVoList(lqw).size();
     }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZAreaMapper.xml

@@ -26,6 +26,7 @@
         from z_area
         where name = #{name}
           and del_flag = '0'
+        order by create_time desc
     </select>
 
     <select id="getArea" resultType="com.ruoyi.zdsz.domain.vo.ZAreaVo">
@@ -36,6 +37,7 @@
         <if test="district != null and district != ''">
             and district = #{district}
         </if>
+        order by create_time desc
     </select>
     <select id="selectGExportsList" resultType="com.ruoyi.zdsz.domain.vo.GImportVo">
         SELECT za.name AS areaName,
@@ -49,6 +51,7 @@
                  LEFT JOIN z_unit zn on zn.building_id = zb.id and zn.del_flag = 0
                  LEFT JOIN z_house zh on zh.unit_id = zn.id and zh.del_flag = 0
         WHERE za.del_flag = 0
+        order by za.create_time desc
     </select>
     <select id="getExport" resultType="com.ruoyi.zdsz.domain.vo.GExportsVo">
         SELECT a.name               AS areaName,
@@ -64,7 +67,7 @@
           AND a.calculate_district = #{calculateDistrict}
           AND a.belonging_pack = #{belongingPack}
         GROUP BY b.area_id
-
+        order by a.create_time desc
     </select>
     <select id="getDictNameOfAffiliatedPackage" resultType="string">
         SELECT CONCAT(a.dict_label, '-工程任务单(', b.dict_label, ')') AS name

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZBuildingMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="areaId != null and areaId != ''">
             and area_id = #{areaId}
         </if>
+        order by create_time desc
     </select>
 
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZBuildingVo">
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.area_id = #{p.areaId}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZComprehensiveMapper.xml

@@ -48,10 +48,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         ) AS total,
         zc.*,
-        zh.NAME AS houseName,
-        zt.NAME AS unitName,
-        zb.NAME AS buildingName,
-        za.NAME AS areaName
+        if(zh.NAME is null , '未知' ,zh.NAME) AS houseName,
+        if(zt.NAME is null , '未知' ,zt.NAME) AS unitName,
+        if(zb.NAME is null , '未知' ,zb.NAME) AS buildingName,
+        if(za.NAME is null , '未知' ,za.NAME) AS areaName
         FROM
         z_comprehensive AS zc
         LEFT JOIN z_house AS zh ON zh.id = zc.house_id
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LIMIT #{page},#{size}
         ) AS a
         )
-
+        order by zc.create_time desc
     </select>
 
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEnginMaterialQualityMapper.xml

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and zc.engin_type LIKE CONCAT('%',#{enginType},'%')
             </if>
         </where>
+        order by zc.create_time desc
     </select>
 
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEnginSpecificationsMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join z_engin_material_quality b on b.id = a.mater_id
         where a.del_flag = '0'
           and a.id = #{id}
+        order by a.create_time desc
     </select>
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo">
         select a.id as id,
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.mater_id = #{p.materId}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
     <select id="getEnginSpecifications" resultType="com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo">
@@ -50,5 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="materId != null and materId != ''">
             and ze.mater_id = #{materId}
         </if>
+        order by ze.create_time desc
+
     </select>
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringCivilMapper.xml

@@ -52,10 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         ) as total,
         a.*,
-        b.name AS areaName,
-        c.name AS buildingName,
-        d.name AS unitName,
-        e.name AS houseName,
+        if(b.name is null , '未知' ,b.NAME) AS areaName,
+        if(c.name is null , '未知' ,c.NAME) AS buildingName,
+        if(d.name is null , '未知' ,d.NAME) AS unitName,
+        if(e.name is null , '未知' ,e.NAME) AS houseName,
         f.dict_label AS enginClassificationName
         from z_engineering_civil a
         left join z_area b on b.id = a.area_id
@@ -86,8 +86,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.enginCycle != null and p.enginCycle != ''">
             and engin_cycle = #{p.enginCycle}
         </if>
+        order by a.create_time desc
         LIMIT #{page},#{size}
         ) AS at)
+        order by a.create_time desc
     </select>
 <select id="getObtainRoomcCompletionInformationList" resultType="com.ruoyi.zdsz.domain.vo.roomStatusVo">
     select

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringMaterialsResetsMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.areaId != null  and p.areaId != ''">
             and ze.area_id LIKE CONCAT('%',#{p.areaId},'%')
         </if>
+        order by ze.create_time desc
     </select>
 
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringPipeJackingMapper.xml

@@ -49,5 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="enginName != null  and enginName != ''">
             and engin_name like concat('%',#{enginName},'%')
         </if>
+        order by create_time desc
     </select>
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZHouseMapper.xml

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.unit_id = #{p.unitId}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
 
@@ -57,5 +58,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="unitId != null  and unitId != ''">
             and zh.unit_id = #{unitId}
         </if>
+        order by zh.create_time desc
     </select>
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZUnitMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="buildingId != null and buildingId != ''">
             and building_id = #{buildingId}
         </if>
+        order by create_time desc
     </select>
 
     <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.building_id = #{p.buildingId}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
 </mapper>