恢复上传图片逻辑

src/main/resources/mapper/TemporaryActivityClockMapper.xml

@@ -27,19 +27,6 @@
     </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_date = #{dateStr} and ap.is_delete = 1;-->
-<!--    </select>-->
-
     <select id="findClockPhotoListByCreateDate" resultMap="clockMap">
         select ar.temporary_id temporary_id,
                ar.create_date create_date,
@@ -49,7 +36,19 @@
                  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 ar.approver_id = '6477368280946792512' and ap.is_delete = 1;
+        where ar.create_date = #{dateStr} 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 ar.approver_id = '6477368280946792512' and ap.is_delete = 1;-->
+<!--    </select>-->
+
 </mapper>

src/main/resources/mapper/TemporaryActivityReportedMapper.xml

@@ -42,26 +42,6 @@
           ORDER BY ar.id;
     </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 LIKE '2024-10-%'
-          and is_delete = 1
-          and approver_id = '6477368280946792512'
-    </select>
-
-<!--    todo-->
 <!--    <select id="findListByCreateDate" resultMap="BaseResultMap">-->
 <!--        select id,-->
 <!--               temporary_id,-->
@@ -76,11 +56,30 @@
 <!--               line_name,-->
 <!--               dept_qc_org_name as org_name-->
 <!--        from temporary_activity_reported-->
-<!--        where create_date = #{dateStr}-->
+<!--        where create_date LIKE '2024-10-%'-->
 <!--          and is_delete = 1-->
-<!--          and (dept_qc_org_name like '%战区' or dept_qc_org_name = '重客运营部')-->
+<!--          and approver_id = '6477368280946792512'-->
 <!--    </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>
+
 <!--    <select id="findListByCreateDate" resultMap="BaseResultMap">-->
 <!--        select ar.id,-->
 <!--               ar.temporary_id,-->