v3项目-修改0903

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsDistributionServiceImpl.java

@@ -159,7 +159,9 @@ public class JsDistributionServiceImpl extends ServiceImpl<JsDistributionMapper,
     @Override
     public PaginationUtil.PageResult<JsProduction> productionPage(Integer pageNum, Integer pageSize, String startTime, String endTime, String animalCertNo) {
         QueryWrapper<JsDistribution> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotEmpty(animalCertNo), "animal_cert_no", animalCertNo).groupBy("supplier_name,purchaser_name");
+        queryWrapper.eq(StringUtils.isNotEmpty(animalCertNo), "animal_cert_no", animalCertNo)
+                .groupBy("supplier_name,purchaser_name,DATE(distribution_time)")
+                .orderByDesc("distribution_time");
         if ("".equals(startTime) || null == startTime) {
 
         } else {

app-admin/src/main/java/com/ruoyi/web/v3/entity/HbCheckAsfEntity.java

@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.AbstractEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbCheckAsfServiceImpl.java

@@ -75,11 +75,12 @@ public class HbCheckAsfServiceImpl extends ServiceImpl<HbCheckAsfMapper, HbCheck
         HbCheckAsfEntity entity = BeanUtil.toBean(request, HbCheckAsfEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbCheckAsfEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        wrapper.lambda().orderByDesc(HbCheckAsfEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbCheckAsfEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbCheckClenbuterolServiceImpl.java

@@ -66,11 +66,13 @@ public class HbCheckClenbuterolServiceImpl extends ServiceImpl<HbCheckClenbutero
         HbCheckClenbuterolEntity entity = BeanUtil.toBean(request, HbCheckClenbuterolEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbCheckClenbuterolEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbCheckClenbuterolEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbCheckClenbuterolEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbCheckMeatQualifiedServiceImpl.java

@@ -63,11 +63,13 @@ public class HbCheckMeatQualifiedServiceImpl extends ServiceImpl<HbCheckMeatQual
         HbCheckMeatQualifiedEntity entity = BeanUtil.toBean(request, HbCheckMeatQualifiedEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbCheckMeatQualifiedEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbCheckMeatQualifiedEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbCheckMeatQualifiedEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEntranceCheckServiceImpl.java

@@ -66,11 +66,13 @@ public class HbEntranceCheckServiceImpl extends ServiceImpl<HbEntranceCheckMappe
         HbEntranceCheckEntity entity = BeanUtil.toBean(request, HbEntranceCheckEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbEntranceCheckEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbEntranceCheckEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbEntranceCheckEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEquipMaintenanceDailyServiceImpl.java

@@ -66,11 +66,13 @@ public class HbEquipMaintenanceDailyServiceImpl extends ServiceImpl<HbEquipMaint
         HbEquipMaintenanceDailyEntity entity = BeanUtil.toBean(request, HbEquipMaintenanceDailyEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbEquipMaintenanceDailyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbEquipMaintenanceDailyEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbEquipMaintenanceDailyEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEquipMaintenanceMonthlyServiceImpl.java

@@ -66,11 +66,13 @@ public class HbEquipMaintenanceMonthlyServiceImpl extends ServiceImpl<HbEquipMai
         HbEquipMaintenanceMonthlyEntity entity = BeanUtil.toBean(request, HbEquipMaintenanceMonthlyEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbEquipMaintenanceMonthlyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbEquipMaintenanceMonthlyEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbEquipMaintenanceMonthlyEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbEquipMaintenanceWeeklyServiceImpl.java

@@ -66,11 +66,13 @@ public class HbEquipMaintenanceWeeklyServiceImpl extends ServiceImpl<HbEquipMain
         HbEquipMaintenanceWeeklyEntity entity = BeanUtil.toBean(request, HbEquipMaintenanceWeeklyEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbEquipMaintenanceWeeklyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbEquipMaintenanceWeeklyEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbEquipMaintenanceWeeklyEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbHarmlessTreatmentServiceImpl.java

@@ -66,11 +66,13 @@ public class HbHarmlessTreatmentServiceImpl extends ServiceImpl<HbHarmlessTreatm
         HbHarmlessTreatmentEntity entity = BeanUtil.toBean(request, HbHarmlessTreatmentEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbHarmlessTreatmentEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbHarmlessTreatmentEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbHarmlessTreatmentEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbReleaseRecordServiceImpl.java

@@ -66,11 +66,13 @@ public class HbReleaseRecordServiceImpl extends ServiceImpl<HbReleaseRecordMappe
         HbReleaseRecordEntity entity = BeanUtil.toBean(request, HbReleaseRecordEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbReleaseRecordEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbReleaseRecordEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbReleaseRecordEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckDailyServiceImpl.java

@@ -75,11 +75,13 @@ public class HbRiskCheckDailyServiceImpl extends ServiceImpl<HbRiskCheckDailyMap
         HbRiskCheckDailyEntity entity = BeanUtil.toBean(request, HbRiskCheckDailyEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbRiskCheckDailyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbRiskCheckDailyEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbRiskCheckDailyEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckLedgerImpl.java

@@ -66,11 +66,13 @@ public class HbRiskCheckLedgerImpl extends ServiceImpl<HbRiskCheckLedgerMapper,
         HbRiskCheckLedgerEntity entity = BeanUtil.toBean(request, HbRiskCheckLedgerEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbRiskCheckLedgerEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbRiskCheckLedgerEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbRiskCheckLedgerEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckMonthlyServiceImpl.java

@@ -74,11 +74,13 @@ public class HbRiskCheckMonthlyServiceImpl extends ServiceImpl<HbRiskCheckMonthl
         HbRiskCheckMonthlyEntity entity = BeanUtil.toBean(request, HbRiskCheckMonthlyEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbRiskCheckMonthlyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbRiskCheckMonthlyEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbRiskCheckMonthlyEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckQuarterServiceImpl.java

@@ -66,11 +66,13 @@ public class HbRiskCheckQuarterServiceImpl extends ServiceImpl<HbRiskCheckQuarte
         HbRiskCheckQuarterEntity entity = BeanUtil.toBean(request, HbRiskCheckQuarterEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbRiskCheckQuarterEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbRiskCheckQuarterEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbRiskCheckQuarterEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskStrategyDictionaryImpl.java

@@ -63,11 +63,13 @@ public class HbRiskStrategyDictionaryImpl extends ServiceImpl<HbRiskStrategyDict
         HbRiskStrategyDictionaryEntity entity = BeanUtil.toBean(request, HbRiskStrategyDictionaryEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbRiskStrategyDictionaryEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbRiskStrategyDictionaryEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbRiskStrategyDictionaryEntity::getId).list());
     }
 }

app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbSlaughterSummaryMonthlyServiceImpl.java

@@ -69,11 +69,13 @@ public class HbSlaughterSummaryMonthlyServiceImpl extends ServiceImpl<HbSlaughte
         HbSlaughterSummaryMonthlyEntity entity = BeanUtil.toBean(request, HbSlaughterSummaryMonthlyEntity.class);
         //构造查询条件（检索条件未定时，先按不为空的字段进行等值查询）
         QueryWrapper<HbSlaughterSummaryMonthlyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        //数据按id降序排列
+        wrapper.lambda().orderByDesc(HbSlaughterSummaryMonthlyEntity::getId);
         return success(baseMapper.selectPage(request.toPage(), wrapper));
     }
 
     @Override
     public AjaxResult listAll() {
-        return success(lambdaQuery().list());
+        return success(lambdaQuery().orderByDesc(HbSlaughterSummaryMonthlyEntity::getId).list());
     }
 }