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

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

@@ -52,6 +52,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->{
@@ -82,6 +83,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/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/ZEngineeringCivilServiceImpl.java

@@ -138,6 +138,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
         lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
         lqw.eq(ZEngineeringCivil::getHouseId, bo.getHouseId());
+        lqw.orderByDesc(ZEngineeringCivil::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());

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());

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

@@ -92,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());
@@ -316,6 +317,7 @@ 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());
         return zEngineeringIndustryTypeVos;
@@ -324,6 +326,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     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/resources/mapper/zdsz/ZComprehensiveMapper.xml

@@ -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/ZEngineeringCivilMapper.xml

@@ -89,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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