导出运营报表2-经纪人日程管理,销售目标,活动量

yd-api/src/main/resources/mapper/agms/AgmsPractitionerMapper.xml

@@ -147,15 +147,27 @@
             t.created_at createdAt
             t.created_at createdAt
         FROM ag_mkt_leads_goals t,ag_acl_practitioner p
         FROM ag_mkt_leads_goals t,ag_acl_practitioner p
         WHERE t.practitioner_id = p.id
         WHERE t.practitioner_id = p.id
-        <if test="date != null">
-            AND t.created_at &gt;= DATE #{date,jdbcType=VARCHAR} AND t.created_at &lt;= DATE #{date,jdbcType=VARCHAR}
-        </if>
+        <choose>
+            <when test="type != null and date != null">
+                <if test="type == 1">
+                    AND t.created_at = year(#{date,jdbcType=VARCHAR})
+                </if>
+                <if test="type == 3">
+                    AND t.created_at = DATE_FORMAT(#{date,jdbcType=VARCHAR}, '%Y%m' )
+                </if>
+            </when>
+            <when test="type != null and date == null">
+                AND t.statistic_time_unit = #{type,jdbcType=BIGINT}
+            </when>
+            <otherwise>
+                <if test="date != null">
+                    AND t.created_at &gt;= DATE #{date,jdbcType=VARCHAR} AND t.created_at &lt;= DATE #{date,jdbcType=VARCHAR}
+                </if>
+            </otherwise>
+        </choose>
         <if test="practitionerId != null">
         <if test="practitionerId != null">
             AND t.practitioner_id = #{practitionerId,jdbcType=BIGINT}
             AND t.practitioner_id = #{practitionerId,jdbcType=BIGINT}
         </if>
         </if>
-        <if test="type != null">
-            AND t.statistic_time_unit = #{type,jdbcType=BIGINT}
-        </if>
         AND t.is_active = 1
         AND t.is_active = 1
     </select>
     </select>