活动记录上传飞书恢复昨日上传

src/main/resources/mapper/TemporaryActivityClockMapper.xml

@@ -44,7 +44,21 @@
     </select>
 
 
-<!--    todo-->
+    <select id="findClockPhotoListByCreateDate" resultMap="clockMap">
+        select
+            ar.temporary_id temporary_id,
+            ar.create_date create_date,
+            ap.type type,
+            ap.photo_url photo_url
+        from
+            temporary_activity_reported ar
+                inner join temporary_activity_clock ac on ar.temporary_id = ac.temporary_id
+                and ar.create_date = ac.create_date
+                inner join temporary_activity_photo ap on ac.id = ap.clock_id
+        where
+            ar.create_time BETWEEN '${dateStr} 00:00:00' and '${dateStr} 23:59:00' and ap.is_delete = 1;
+    </select>
+
 <!--    <select id="findClockPhotoListByCreateDate" resultMap="clockMap">-->
 <!--        select ar.temporary_id temporary_id,-->
 <!--               ar.create_date create_date,-->
@@ -54,21 +68,9 @@
 <!--                 inner join temporary_activity_clock ac-->
 <!--                            on ar.temporary_id = ac.temporary_id and ar.create_date = ac.create_date-->
 <!--                 inner join temporary_activity_photo ap on ac.id = ap.clock_id-->
-<!--        where ar.create_date = #{dateStr} and ap.is_delete = 1;-->
+<!--        where ar.create_date LIKE '2024-10-%' and ap.is_delete = 1;-->
 <!--    </select>-->
 
-    <select id="findClockPhotoListByCreateDate" resultMap="clockMap">
-        select ar.temporary_id temporary_id,
-               ar.create_date create_date,
-               ap.type type,
-               ap.photo_url photo_url
-        from temporary_activity_reported ar
-                 inner join temporary_activity_clock ac
-                            on ar.temporary_id = ac.temporary_id and ar.create_date = ac.create_date
-                 inner join temporary_activity_photo ap on ac.id = ap.clock_id
-        where ar.create_date LIKE '2024-10-%' and ap.is_delete = 1;
-    </select>
-
 
     <select id="findClockListByActivityIds" resultMap="clockInfoMap">
         SELECT

src/main/resources/mapper/TemporaryActivityReportedMapper.xml

@@ -43,7 +43,25 @@
           ORDER BY ar.id;
     </select>
 
-<!--    todo 添加经销商名称：dealer_name-->
+<!--    <select id="findListByCreateDate" resultMap="BaseResultMap">-->
+<!--        select id,-->
+<!--               temporary_id,-->
+<!--               approver_id,-->
+<!--               temporary_name,-->
+<!--               approve_name,-->
+<!--               city,-->
+<!--               create_date,-->
+<!--               dealer_name,-->
+<!--               store_name,-->
+<!--               activity_pattern,-->
+<!--               approve_status,-->
+<!--               line_name,-->
+<!--               dept_qc_org_name as org_name-->
+<!--        from temporary_activity_reported-->
+<!--        where create_date LIKE '2024-10-%'-->
+<!--          and is_delete = 1-->
+<!--    </select>-->
+
     <select id="findListByCreateDate" resultMap="BaseResultMap">
         select id,
                temporary_id,
@@ -59,27 +77,9 @@
                line_name,
                dept_qc_org_name as org_name
         from temporary_activity_reported
-        where create_date LIKE '2024-10-%'
+        where create_time BETWEEN '${dateStr} 00:00:00' and '${dateStr} 23:59:00'
           and is_delete = 1
+          and (dept_qc_org_name like '%战区' or dept_qc_org_name = '重客运营部')
     </select>
 
-<!--    <select id="findListByCreateDate" resultMap="BaseResultMap">-->
-<!--        select id,-->
-<!--               temporary_id,-->
-<!--               approver_id,-->
-<!--               temporary_name,-->
-<!--               approve_name,-->
-<!--               city,-->
-<!--               create_date,-->
-<!--               store_name,-->
-<!--               activity_pattern,-->
-<!--               approve_status,-->
-<!--               line_name,-->
-<!--               dept_qc_org_name as org_name-->
-<!--        from temporary_activity_reported-->
-<!--        where create_date = #{dateStr}-->
-<!--          and is_delete = 1-->
-<!--          and (dept_qc_org_name like '%战区' or dept_qc_org_name = '重客运营部')-->
-<!--    </select>-->
-
 </mapper>