submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -3621,6 +3621,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public List<UserUsbRecordVo> getListUserSubscribe(UserUsbRecordBo bo) {
+
         return null;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/service/impl/ITopInstSettleServiceImpl.java

@@ -883,7 +883,7 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
         }
         BigDecimal reduce = settleVos.stream().filter(x -> ObjectUtil.isNotNull(x.getSettleMoney())).map(SettleVo::getSettleMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
         settleVo.setSettleMoney(reduce);
-        Integer size = settleVos.stream().filter(x -> x.getCheckStatus() == 1 || x.getCheckStatus() == 2).collect(Collectors.toList()).size();
+        Integer size = settleVos.stream().filter(x -> x.getCheckStatus() == 2).collect(Collectors.toList()).size();
         settleVo.setSettleCheckNum(Long.valueOf(size));
         return settleVo;
     }

zhongzheng-system/src/main/resources/mapper/modules/settle/ExamActivityMapper.xml

@@ -29,8 +29,7 @@
 
     <select id="geTopCostBusinessName" parameterType="java.lang.Long" resultType="java.lang.String">
         SELECT CONCAT(( SELECT education_name FROM top_course_education_type WHERE id = ct.education_type_id ),
-                      ( SELECT business_name FROM top_course_business WHERE id = ct.business_id ),
-                      ( SELECT project_name FROM top_course_project_type WHERE id = ct.project_id )
+                      ( SELECT old_business_name FROM top_course_business WHERE id = ct.business_id )
                    )
         FROM
             top_cost_inst_tp_item ct