fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -2339,7 +2339,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 return;
             }
             //环比
-            item.setWeekRate("100%");
+            item.setWeekRate("100");
             Long startTime = bo.getStartTime();
             Long endTime = bo.getEndTime();
             Long time = endTime - startTime;
@@ -2353,11 +2353,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 BigDecimal subtract = item.getMoney().subtract(money);
                 BigDecimal divide = subtract.divide(money,2, RoundingMode.HALF_UP);
                 String s = divide.multiply(new BigDecimal("100")).toString();
-                item.setWeekRate(s+"%");
+                item.setWeekRate(s);
             }
 
             //同比
-            item.setYearRate("100%");
+            item.setYearRate("100");
             Long startBefore = DateUtils.getDayBefore(bo.getStartTime(), 365);
             Long endBefore = DateUtils.getDayBefore(bo.getEndTime(), 365);
             topOrderStatisticsBo.setStartTime(startBefore);
@@ -2369,7 +2369,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 BigDecimal subtract = item.getMoney().subtract(money2);
                 BigDecimal divide = subtract.divide(money2,2, RoundingMode.HALF_UP);
                 String s = divide.multiply(new BigDecimal("100")).toString();
-                item.setYearRate(s+"%");
+                item.setYearRate(s);
             }
 
             //占比
@@ -2421,7 +2421,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 return;
             }
             //环比
-            item.setWeekRate("100%");
+            item.setWeekRate("100");
             Long startTime = bo.getStartTime();
             Long endTime = bo.getEndTime();
             Long time = endTime - startTime;
@@ -2435,10 +2435,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 Long subtract = item.getOrderNum() - num;
                 BigDecimal divide = new BigDecimal(subtract).divide(new BigDecimal(num),2, RoundingMode.HALF_UP);
                 String s = divide.multiply(new BigDecimal("100")).toString();
-                item.setWeekRate(s+"%");
+                item.setWeekRate(s);
             }
             //同比
-            item.setYearRate("100%");
+            item.setYearRate("100");
             Long startBefore = DateUtils.getDayBefore(bo.getStartTime(), 365);
             Long endBefore = DateUtils.getDayBefore(bo.getEndTime(), 365);
             topOrderStatisticsBo.setStartTime(startBefore);
@@ -2448,7 +2448,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 Long subtract = item.getOrderNum() - num2;
                 BigDecimal divide = new BigDecimal(subtract).divide(new BigDecimal(num2),2, RoundingMode.HALF_UP);
                 String s = divide.multiply(new BigDecimal("100")).toString();
-                item.setWeekRate(s+"%");
+                item.setWeekRate(s);
             }
 
             //占比

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -836,7 +836,7 @@
                     tenant_id,
                     SUM( order_received - order_refunded ) money
                     <if test="tenantId != null and tenantId != ''">
-                        , create_no,any_value(too.create_username) as create_username
+                        , create_no,any_value(create_username) as create_username
                     </if>
                 FROM
                  v_top_order

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -1871,6 +1871,9 @@
                                  cmc.module_id = cm.menu_id
                             <if test="tenantId != null and tenantId !=''">
                                 AND cmc.tenant_id =#{tenantId}
+                            </if>
+                            <if test="tenantId != null and tenantId !=''">
+                                AND ccs.tenant_id =#{tenantId}
                             </if>
                                 )
                         WHEN cm.type = 2 THEN
@@ -1889,7 +1892,7 @@
                         ELSE 0
                         END
                 ) AS section_num ,
-            (SELECT count(*) from user_study_record usr where usr.user_id = #{userId} and usr.grade_id = #{gradeId} and usr.order_goods_id = #{orderGoodsId} and usr.current_status = 1 ) as study_status,
+            (SELECT count(*) from user_study_record usr where usr.user_id = #{userId} and usr.grade_id = #{gradeId} and usr.order_goods_id = #{orderGoodsId} and usr.current_status = 1 and usr.`status` = 1) as study_status,
             (select COUNT(DISTINCT course_id,module_id,chapter_id,section_id)
                                         FROM user_study_record c where 1=1
                                         and c.current_status=1