yangdamao 2 vuotta sitten
vanhempi
commit
90571ccb1f

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -1084,7 +1084,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         result.forEach(item -> {
             String date = "yyyy-MM-dd HH:mm:ss";
             item.setOrderTime(DateUtils.timestampToDateFormat(item.getOrderTimeLong(),date));
-            item.setCreateTime(DateUtils.timestampToDateFormat(item.getCreateTimeLong(),date));
+            item.setCreateTime(DateUtils.timestampToDateFormat(item.getOrderTimeLong(),date));
             item.setDoTime(DateUtils.timestampToDateFormat(item.getDoTimeLong(),date));
             //机构名称
             SysTenant tenant = sysTenantService.getById(item.getTenantId());

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -990,7 +990,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN goods g ON cgg.goods_id = g.goods_id
             LEFT JOIN course_business cb ON g.business_id = cb.id
         WHERE
-            cb.alias_name = #{aliasName} AND cg.class_status = 0 AND cg.`status` = 1 AND g.goods_status = 1
+            cb.alias_name = #{aliasName} AND cg.class_status = 0 AND cg.`status` = 1 AND g.goods_status = 1 AND cb.`status` = 1
         <if test="subIds != null and subIds.size()!=0 ">
             AND (
             <foreach collection="subIds" item="id" index="index">