提交 dd8cc2d1 authored 作者: 000516's avatar 000516 提交者: Coding

更改原逻辑,根据时间段查询上报任务列表

Merge Request: 更改原逻辑,根据时间段查询上报任务列表 Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/wangxiaolu-export/git/merge/187?initial=true
...@@ -182,7 +182,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe ...@@ -182,7 +182,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
// rowClockData.add(clockDo.getNoonClockOutAddress()); // rowClockData.add(clockDo.getNoonClockOutAddress());
// rowClockData.add(clockDo.getNoonClockInAddress()); // rowClockData.add(clockDo.getNoonClockInAddress());
// rowClockData.add(clockDo.getClockOutAddress()); // rowClockData.add(clockDo.getClockOutAddress());
rowClockData.add(clockDo.toString()); rowClockData.add(addrSb.toString());
String range = String.format(rangFormat, "T", "V"); String range = String.format(rangFormat, "T", "V");
updateClockData(range, rowClockData); updateClockData(range, rowClockData);
} }
......
...@@ -19,47 +19,28 @@ ...@@ -19,47 +19,28 @@
<result property="orgName" column="org_name" jdbcType="VARCHAR"/> <result property="orgName" column="org_name" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<select id="findList" resultMap="BaseResultMap"> <!-- <select id="findList" resultMap="BaseResultMap">-->
select ar.id, <!-- select ar.id,-->
ar.temporary_id, <!-- ar.temporary_id,-->
ar.approver_id, <!-- ar.approver_id,-->
ar.temporary_name, <!-- ar.temporary_name,-->
ar.approve_name, <!-- ar.approve_name,-->
ar.city, <!-- ar.city,-->
ar.create_date, <!-- ar.create_date,-->
ar.store_id, <!-- ar.store_id,-->
ar.store_name, <!-- ar.store_name,-->
ar.activity_pattern, <!-- ar.activity_pattern,-->
ar.approve_status, <!-- ar.approve_status,-->
ps.line_name, <!-- ps.line_name,-->
qd.org_name <!-- qd.org_name-->
from temporary_activity_reported ar <!-- from temporary_activity_reported ar-->
left join promotion_store ps on ar.store_id = ps.id <!-- left join promotion_store ps on ar.store_id = ps.id-->
left join qince_employee qe on ar.approver_id = qe.qc_id <!-- left join qince_employee qe on ar.approver_id = qe.qc_id-->
left join qince_department qd on qe.waiqin365_org_id = qd.qc_id <!-- left join qince_department qd on qe.waiqin365_org_id = qd.qc_id-->
where (ar.create_time between #{params.createDateStart} and #{params.createDateEnd}) <!-- where (ar.create_time between #{params.createDateStart} and #{params.createDateEnd})-->
and ar.is_delete = 1 <!-- and ar.is_delete = 1-->
and (qd.org_name like '%战区' or qd.org_name = '重客运营部') <!-- and (qd.org_name like '%战区' or qd.org_name = '重客运营部')-->
ORDER BY ar.id; <!-- ORDER BY ar.id;-->
</select>
<!-- <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>-->
<select id="findListByCreateDate" resultMap="BaseResultMap"> <select id="findListByCreateDate" resultMap="BaseResultMap">
...@@ -82,6 +63,27 @@ ...@@ -82,6 +63,27 @@
and (dept_qc_org_name like '%战区' or dept_qc_org_name = '重客运营部') and (dept_qc_org_name like '%战区' or dept_qc_org_name = '重客运营部')
</select> </select>
<select id="findList" 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_time between #{params.createDateStart} and #{params.createDateEnd}
and is_delete = 1
and (dept_qc_org_name like '%战区' or dept_qc_org_name = '重客运营部')
</select>
<select id="selectListByIds" resultMap="BaseResultMap"> <select id="selectListByIds" resultMap="BaseResultMap">
select id, select id,
temporary_id, temporary_id,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论