提交 046db9fe authored 作者: 000516's avatar 000516 提交者: Coding

推送促销数据到电子表格时,新增数据

推送促销数据到电子表格时,新增数据
...@@ -103,11 +103,13 @@ public class ActivityToFeishuSheet { ...@@ -103,11 +103,13 @@ public class ActivityToFeishuSheet {
log.info("============== 活动记录上传飞书 end =============="); log.info("============== 活动记录上传飞书 end ==============");
} }
/**
* @param activityIds 6166L,6181L,6319L,6359L,6431L
*/
@GetMapping("/feishu/ids_sheet") @GetMapping("/feishu/ids_sheet")
public void idsActivityList(){ public void idsActivityList(List<Long> activityIds){
log.info("============== 活动记录上传飞书 start =============="); log.info("============== 活动记录上传飞书 start ==============");
List<Long> activityIds = Arrays.asList(6166L,6181L,6319L,6359L,6431L,6514L,6542L,6648L,6745L,6797L);
List<TemporaryActivityReportedDO> reportedDos = promotionActivityService.findActivityListByIds(activityIds); List<TemporaryActivityReportedDO> reportedDos = promotionActivityService.findActivityListByIds(activityIds);
log.info("应上传飞书{}条活动记录",reportedDos.size()); log.info("应上传飞书{}条活动记录",reportedDos.size());
......
...@@ -21,6 +21,7 @@ public class TemporaryActivityClockDO implements Serializable { ...@@ -21,6 +21,7 @@ public class TemporaryActivityClockDO implements Serializable {
private Long reportedId; private Long reportedId;
private String createDate; private String createDate;
private String qinceStoreCode;
/** /**
* 上班打卡地址 * 上班打卡地址
......
...@@ -6,6 +6,7 @@ import lombok.Data; ...@@ -6,6 +6,7 @@ import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* *
...@@ -35,6 +36,7 @@ public class TemporaryActivityPhotoDO implements Serializable { ...@@ -35,6 +36,7 @@ public class TemporaryActivityPhotoDO implements Serializable {
* 图片http地址 * 图片http地址
*/ */
private String photoUrl; private String photoUrl;
private Date createTime;
@TableField(exist = false) @TableField(exist = false)
......
...@@ -2,9 +2,10 @@ spring: ...@@ -2,9 +2,10 @@ spring:
datasource: datasource:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://bj-cdb-j8ppdy86.sql.tencentcdb.com:63569/promotion_dev?autoReconnect=true # url: jdbc:mysql://bj-cdb-j8ppdy86.sql.tencentcdb.com:63569/promotion_dev?autoReconnect=true
username: LnNDBM url: jdbc:mysql://192.168.100.39:25301/promotion_dev?autoReconnect=true
password: fd0%bhD4@oO(% username: root
password: Zt%68Dsuv&M
redis: redis:
port: 21101 port: 21101
host: bj-crs-oyzhz3c6.sql.tencentcdb.com host: bj-crs-oyzhz3c6.sql.tencentcdb.com
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
<collection property="photoList" ofType="com.wangxiaolu.export.mapper.entity.TemporaryActivityPhotoDO"> <collection property="photoList" ofType="com.wangxiaolu.export.mapper.entity.TemporaryActivityPhotoDO">
<result property="type" column="type" jdbcType="INTEGER"/> <result property="type" column="type" jdbcType="INTEGER"/>
<result property="photoUrl" column="photo_url" jdbcType="VARCHAR"/> <result property="photoUrl" column="photo_url" jdbcType="VARCHAR"/>
<result property="photoUrl" column="photo_url" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</collection> </collection>
</resultMap> </resultMap>
...@@ -17,6 +19,7 @@ ...@@ -17,6 +19,7 @@
<resultMap id="clockInfoMap" type="com.wangxiaolu.export.mapper.entity.TemporaryActivityClockDO"> <resultMap id="clockInfoMap" type="com.wangxiaolu.export.mapper.entity.TemporaryActivityClockDO">
<result property="temporaryId" column="temporary_id" jdbcType="BIGINT"/> <result property="temporaryId" column="temporary_id" jdbcType="BIGINT"/>
<result property="reportedId" column="reported_id" jdbcType="BIGINT"/> <result property="reportedId" column="reported_id" jdbcType="BIGINT"/>
<result property="qinceStoreCode" column="qince_store_code" jdbcType="VARCHAR"/>
<result property="createDate" column="create_date" jdbcType="VARCHAR"/> <result property="createDate" column="create_date" jdbcType="VARCHAR"/>
<result property="clockInTime" column="clock_in_time" jdbcType="TIMESTAMP"/> <result property="clockInTime" column="clock_in_time" jdbcType="TIMESTAMP"/>
<result property="noonClockOutTime" column="noon_clock_out_time" jdbcType="TIMESTAMP"/> <result property="noonClockOutTime" column="noon_clock_out_time" jdbcType="TIMESTAMP"/>
...@@ -49,7 +52,8 @@ ...@@ -49,7 +52,8 @@
ar.temporary_id temporary_id, ar.temporary_id temporary_id,
ar.create_date create_date, ar.create_date create_date,
ap.type type, ap.type type,
ap.photo_url photo_url ap.photo_url photo_url,
ap.create_time create_time
from from
temporary_activity_reported ar temporary_activity_reported ar
inner join temporary_activity_clock ac on ar.temporary_id = ac.temporary_id inner join temporary_activity_clock ac on ar.temporary_id = ac.temporary_id
...@@ -75,6 +79,7 @@ ...@@ -75,6 +79,7 @@
<select id="findClockListByActivityIds" resultMap="clockInfoMap"> <select id="findClockListByActivityIds" resultMap="clockInfoMap">
SELECT SELECT
reported_id, reported_id,
qince_store_code,
clock_in_time, clock_in_time,
clock_in_address, clock_in_address,
noon_clock_out_time, noon_clock_out_time,
......
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
<result property="clockId" column="clock_id" jdbcType="BIGINT"/> <result property="clockId" column="clock_id" jdbcType="BIGINT"/>
<result property="type" column="type" jdbcType="INTEGER"/> <result property="type" column="type" jdbcType="INTEGER"/>
<result property="photoUrl" column="photo_url" jdbcType="VARCHAR"/> <result property="photoUrl" column="photo_url" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</resultMap> </resultMap>
<select id="findActivityPhotos" resultMap="BaseResultMap"> <select id="findActivityPhotos" resultMap="BaseResultMap">
select reported_id, type, photo_url select reported_id, type, photo_url,create_time
from temporary_activity_photo from temporary_activity_photo
where is_delete = 1 where is_delete = 1
and reported_id in and reported_id in
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论