Commit e51b020b authored by hongguangwu's avatar hongguangwu

MVP1.6.9-企微招聘平台

parent 03fdfd10
...@@ -57,9 +57,12 @@ public class EkpQiwiZhaoPin { ...@@ -57,9 +57,12 @@ public class EkpQiwiZhaoPin {
@Schema(description = "关联结算ID") @Schema(description = "关联结算ID")
private String fdSettleFormId; private String fdSettleFormId;
@Schema(description = "创建时间") @Schema(description = "创建申请时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@Schema(description = "同步这条数据时间")
private LocalDateTime createDataTime;
// 企微、HCM // 企微、HCM
@Schema(description = "数据源") @Schema(description = "数据源")
private String fdDataSource; private String fdDataSource;
......
...@@ -799,7 +799,9 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -799,7 +799,9 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
JSONObject jsonObject = JSON.parseObject(info); JSONObject jsonObject = JSON.parseObject(info);
if (Common.isNotNull(info)) { if (Common.isNotNull(info)) {
reimburse.setFdDataSource("企微"); reimburse.setFdDataSource("企微");
reimburse.setCreateTime(LocalDateTime.now()); reimburse.setCreateDataTime(LocalDateTime.now());
// 为了EKP范围查询而存的申请时间
reimburse.setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(Long.parseLong(String.valueOf(jsonObject.get("apply_time")))), ZoneId.systemDefault()));
String userId = ((JSONObject) jsonObject.get("applyer")).getString("userid"); String userId = ((JSONObject) jsonObject.get("applyer")).getString("userid");
if (Common.isNotNull(userId) && userMap.get(userId) != null) { if (Common.isNotNull(userId) && userMap.get(userId) != null) {
reimburse.setFdApplyUserName(userMap.get(userId)); reimburse.setFdApplyUserName(userMap.get(userId));
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<result property="fdTwoMoneySum" column="FD_TWO_MONEY_SUM"/> <result property="fdTwoMoneySum" column="FD_TWO_MONEY_SUM"/>
<result property="fdTwoYeWu" column="FD_TWO_YE_WU"/> <result property="fdTwoYeWu" column="FD_TWO_YE_WU"/>
<result property="fdTwoRemark" column="FD_TWO_REMARK"/> <result property="fdTwoRemark" column="FD_TWO_REMARK"/>
<result property="createDataTime" column="CREATE_DATA_TIME"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.FD_ID, a.FD_ID,
...@@ -83,7 +84,8 @@ ...@@ -83,7 +84,8 @@
a.FD_TWO_NUM, a.FD_TWO_NUM,
a.FD_TWO_MONEY_SUM, a.FD_TWO_MONEY_SUM,
a.FD_TWO_YE_WU, a.FD_TWO_YE_WU,
a.FD_TWO_REMARK a.FD_TWO_REMARK,
a.CREATE_DATA_TIME
</sql> </sql>
<!--获取全部的,用来: 拉取企业微信时,不覆盖数据 --> <!--获取全部的,用来: 拉取企业微信时,不覆盖数据 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment