Merge branch 'dev_1_3_2_20220815'

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRewardChangeStockMapper.xml

@@ -6,27 +6,18 @@
 	        <result column="reward_id_" property="rewardId" />
 	        <result column="stock_" property="stock" />
 	        <result column="change_type_" property="changeType" />
-	        <result column="create_time_" property="createTime" />
+            <result column="source_" property="source" />
+            <result column="create_time_" property="createTime" />
 	        <result column="create_by_" property="createBy" />
 		</resultMap>  
     
     <!-- 表字段 -->
     <sql id="baseColumns">
-         t.id_ as id
-        , t.reward_id_ as rewardId
-        , t.stock_ as stock
-        , t.change_type_ as changeType
-        , t.create_time_ as createTime
-        , t.create_by_ as createBy
-        </sql>
-
-    <!-- 表字段 -->
-    <sql id="baseColumns">
         t.id_ as id
         , t.reward_id_ as rewardId
         , t.stock_ as stock
         , t.change_type_ as changeType
-        , t.source_ as source
+        , t.source_ as `source`
         , t.create_time_ as createTime
         , t.create_by_ as createBy
     </sql>

cooleshow-user/user-biz/src/main/resources/config/mybatis/HomeMapper.xml

@@ -50,7 +50,7 @@
 		) a on t.sys_day_ymd_ = a.timeStr
 		left join (
 			select
-				DATE_FORMAT(t.create_time_,'%Y-%m-%d') as timeStr,
+				DATE_FORMAT(t.entry_auth_date_,'%Y-%m-%d') as timeStr,
 				count(1) as entryNum
 			from teacher t
 			<where>
@@ -62,11 +62,11 @@
 					<![CDATA[AND t.entry_auth_date_ < #{param.endTime} ]]>
 				</if>
 			</where>
-			group by DATE_FORMAT(t.create_time_,'%Y-%m-%d')
+			group by DATE_FORMAT(t.entry_auth_date_,'%Y-%m-%d')
 		) b on t.sys_day_ymd_ = b.timeStr
 		left join (
 			select
-				DATE_FORMAT(t.create_time_,'%Y-%m-%d') as timeStr,
+				DATE_FORMAT(t.live_date_,'%Y-%m-%d') as timeStr,
 				count(1) as liveNum
 			from teacher t
 			<where>
@@ -77,11 +77,11 @@
 					<![CDATA[AND t.live_date_ < #{param.endTime} ]]>
 				</if>
 			</where>
-			group by DATE_FORMAT(t.create_time_,'%Y-%m-%d')
+			group by DATE_FORMAT(t.live_date_,'%Y-%m-%d')
 		) c on t.sys_day_ymd_ = c.timeStr
 		left join (
 			select
-				DATE_FORMAT(t.create_time_,'%Y-%m-%d') as timeStr,
+				DATE_FORMAT(t.musician_date_,'%Y-%m-%d') as timeStr,
 				count(1) as musicianNum
 			from teacher t
 			<where>
@@ -93,7 +93,7 @@
 					<![CDATA[AND t.musician_date_ < #{param.endTime} ]]>
 				</if>
 			</where>
-			group by DATE_FORMAT(t.create_time_,'%Y-%m-%d')
+			group by DATE_FORMAT(t.musician_date_,'%Y-%m-%d')
 		) d on t.sys_day_ymd_ = d.timeStr
 		<where>
 			<if test="param.startTime !=null">