Browse Source

fix:优化

release-sy-v1.0.0
“lyd” 1 month ago
parent
commit
011df29288
  1. 1
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
  2. 1
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
  3. 3
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java
  4. 3
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
  5. 2
      shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java
  6. 2
      shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java
  7. 2
      shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
  8. 2
      shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java
  9. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java
  10. 1
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java
  11. 3
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java
  12. 3
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java

1
shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java

@ -84,6 +84,7 @@ public class DfCheckingProblemV2Service extends BaseService<DfCheckingProblemV2M
.ifPresent(recordId -> queryWrapper.eq(DfCheckingProblemV2::getRecordId, recordId));
queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue());
queryWrapper.orderByDesc(DfCheckingProblemV2::getCreateTime);
// 查询分页数据
Page<DfCheckingProblemV2> queryPage = page(page, queryWrapper);

1
shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java

@ -83,6 +83,7 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
queryWrapper.le(DfCheckingRecord::getEndDate, data.getEndDate());
}
}
queryWrapper.orderByDesc(DfCheckingRecord::getCreateTime);
// 查询分页数据
Page<DfCheckingRecord> queryPage = page(page, queryWrapper);

3
shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yxgh.df.domain.DfCheckingRecord;
import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem;
import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage;
import com.kms.yxgh.df.dto.DfCheckingDetailDto;
@ -56,6 +57,8 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
.ifPresent(name -> queryWrapper.like(DfCheckingV2ProjectManage::getName, name));
}
queryWrapper.orderByDesc(DfCheckingV2ProjectManage::getCreateTime);
// 查询分页数据
Page<DfCheckingV2ProjectManage> queryPage = page(page, queryWrapper);
if (queryPage == null) {

3
shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java

@ -19,6 +19,7 @@ import com.kms.yxgh.common.service.ApprovalService;
import com.kms.yxgh.common.service.DefaultApprovalBusinessService;
import com.kms.yxgh.df.domain.DfCheckingProblemV2;
import com.kms.yxgh.df.domain.DfCheckingRecord;
import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage;
import com.kms.yxgh.df.domain.DfYhV2;
import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
import com.kms.yxgh.df.dto.v2.DfYhApproveDto;
@ -103,6 +104,8 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
}
queryWrapper.orderByDesc(DfYhV2::getCreateTime);
// 查询分页数据
Page<DfYhV2> queryPage = page(page, queryWrapper);
if (queryPage == null) {

2
shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage;
import com.kms.yxgh.dw.domain.DwCheckingProblemV2;
import com.kms.yxgh.dw.domain.DwYhV2;
import com.kms.yxgh.dw.dto.DwProblemV2Dto;
@ -85,6 +86,7 @@ public class DwCheckingProblemV2Service extends BaseService<DwCheckingProblemV2M
.ifPresent(recordId -> queryWrapper.eq(DwCheckingProblemV2::getRecordId, recordId));
queryWrapper.ne(DwCheckingProblemV2::getStatus, DURING_INSPECTION.getValue());
queryWrapper.orderByDesc(DwCheckingProblemV2::getCreateTime);
// 查询分页数据
Page<DwCheckingProblemV2> queryPage = page(page, queryWrapper);

2
shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java

@ -81,7 +81,7 @@ public class DwCheckingRecordV2Service extends BaseService<DwCheckingRecordV2Map
queryWrapper.le(DwCheckingRecord::getEndDate, data.getEndDate());
}
}
queryWrapper.orderByDesc(DwCheckingRecord::getCreateTime);
// 查询分页数据
Page<DwCheckingRecord> queryPage = page(page, queryWrapper);
if (queryPage == null) {

2
shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yxgh.df.service.DfCheckingV2Service;
import com.kms.yxgh.dw.domain.DwCheckingRecord;
import com.kms.yxgh.dw.domain.DwCheckingV2ProjectItem;
import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage;
@ -57,6 +58,7 @@ public class DwCheckingV2Service extends BaseService<DwCheckingV2Mapper, DwCheck
.filter(StringUtils::isNotBlank)
.ifPresent(name -> queryWrapper.like(DwCheckingV2ProjectManage::getName, name));
}
queryWrapper.orderByDesc(DwCheckingV2ProjectManage::getCreateTime);
// 查询分页数据
Page<DwCheckingV2ProjectManage> queryPage = page(page, queryWrapper);

2
shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java

@ -18,6 +18,7 @@ import com.kms.yxgh.common.service.ApprovalService;
import com.kms.yxgh.common.service.DefaultApprovalBusinessService;
import com.kms.yxgh.dw.domain.DwCheckingProblemV2;
import com.kms.yxgh.dw.domain.DwCheckingRecord;
import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage;
import com.kms.yxgh.dw.domain.DwYhV2;
import com.kms.yxgh.dw.dto.DwRecordSearchV2Dto;
import com.kms.yxgh.dw.dto.DwYhApproveDto;
@ -99,6 +100,7 @@ public class DwYhV2Service extends DefaultApprovalBusinessService<DwYhV2Mapper,
.ifPresent(recordId -> queryWrapper.eq(DwYhV2::getRecordId, recordId));
}
queryWrapper.orderByDesc(DwYhV2::getCreateTime);
// 查询分页数据
Page<DwYhV2> queryPage = page(page, queryWrapper);

2
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yxgh.df.domain.DfCheckingProblemV2;
import com.kms.yxgh.df.dto.v2.DfProblemV2Dto;
import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto;
import com.kms.yxgh.dw.domain.DwYhV2;
import com.kms.yxgh.sz.domain.SzCheckingProblemV2;
import com.kms.yxgh.sz.domain.SzYhV2;
import com.kms.yxgh.sz.dto.v2.SzProblemV2Dto;
@ -86,6 +87,7 @@ public class SzCheckingProblemV2Service extends BaseService<SzCheckingProblemV2M
.ifPresent(recordId -> queryWrapper.eq(SzCheckingProblemV2::getProblemLevel, recordId));
queryWrapper.ne(SzCheckingProblemV2::getStatus, DURING_INSPECTION.getValue());
queryWrapper.orderByDesc(SzCheckingProblemV2::getCreateTime);
// 查询分页数据
Page<SzCheckingProblemV2> queryPage = page(page, queryWrapper);

1
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java

@ -83,6 +83,7 @@ public class SzCheckingRecordV2Service extends BaseService<SzCheckingRecordV2Map
}
}
queryWrapper.orderByDesc(SzCheckingRecord::getCreateTime);
// 查询分页数据
Page<SzCheckingRecord> queryPage = page(page, queryWrapper);
if (queryPage == null) {

3
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yxgh.df.service.DfCheckingV2Service;
import com.kms.yxgh.sz.domain.SzCheckingRecord;
import com.kms.yxgh.sz.domain.SzCheckingV2ProjectItem;
import com.kms.yxgh.sz.domain.SzCheckingV2ProjectManage;
import com.kms.yxgh.sz.dto.v2.SzCheckingDetailDto;
@ -52,7 +53,7 @@ public class SzCheckingV2Service extends BaseService<SzCheckingV2Mapper, SzCheck
.filter(StringUtils::isNotBlank)
.ifPresent(name -> queryWrapper.like(SzCheckingV2ProjectManage::getName, name));
}
queryWrapper.orderByDesc(SzCheckingV2ProjectManage::getCreateTime);
// 查询分页数据
Page<SzCheckingV2ProjectManage> queryPage = page(page, queryWrapper);
if (queryPage == null) {

3
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java

@ -19,6 +19,7 @@ import com.kms.yxgh.common.service.DefaultApprovalBusinessService;
import com.kms.yxgh.df.service.DfCheckingV2Service;
import com.kms.yxgh.sz.domain.SzCheckingProblemV2;
import com.kms.yxgh.sz.domain.SzCheckingRecord;
import com.kms.yxgh.sz.domain.SzCheckingV2ProjectManage;
import com.kms.yxgh.sz.domain.SzYhV2;
import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto;
import com.kms.yxgh.sz.dto.v2.SzYhApproveDto;
@ -102,7 +103,7 @@ public class SzYhV2Service extends DefaultApprovalBusinessService<SzYhV2Mapper,
.ifPresent(recordId -> queryWrapper.eq(SzYhV2::getRecordId, recordId));
}
queryWrapper.orderByDesc(SzYhV2::getCreateTime);
// 查询分页数据
Page<SzYhV2> queryPage = page(page, queryWrapper);
if (queryPage == null) {

Loading…
Cancel
Save