77

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java

@@ -110,13 +110,13 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
             criteria.eq("c.completed", vo.getCompleted());
         }
         if (Objects.nonNull(vo.getAssignState())) {
-            criteria.eq("c.assign_state", vo.getAssignState());
+            criteria.eq("c.calculate_score", vo.getAssignState());
         }
         if (Objects.nonNull(vo.getScoreStart()) && Objects.isNull(vo.getScoreEnd())) {
-            criteria.ge("c.average_score", vo.getScoreStart());
+            criteria.ge("c.calculate_score", vo.getScoreStart());
         }
         if (Objects.nonNull(vo.getScoreEnd()) && Objects.isNull(vo.getScoreStart())) {
-            criteria.le("c.average_score", vo.getScoreEnd());
+            criteria.le("c.calculate_score", vo.getScoreEnd());
         }
         if (Objects.nonNull(vo.getScoreStart()) && Objects.nonNull(vo.getScoreEnd())) {
             criteria.and(qw -> qw.ge("c.average_score", vo.getScoreStart()).le("c.average_score", vo.getScoreEnd()));
@@ -342,7 +342,8 @@ public class ComProjectAuditServiceImpl extends BaseServiceImpl<ComProjectAuditD
     public Pagination<ComProjectAuditDTO> getProjectAuditListByPage(ComProjectAuditQueryVO vo) {
         QueryWrapper criteria = new QueryWrapper();
         setCriteriaForQuery(vo, criteria);
-        criteria.orderByDesc("c.average_score");
+        criteria.orderByDesc("c.proj_class");
+        criteria.orderByDesc("c.calculate_score");
         criteria.orderByAsc("p1.display_order");
         criteria.orderByAsc("p.display_order");
         Page<ComProjectAuditQueryVO> page = new Page<>(vo.getPageIndex(), vo.getPageSize());