diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkRelationMainMapper.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkRelationMainMapper.java index b387a73..2ecfb3b 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkRelationMainMapper.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/ErpLarkRelationMainMapper.java @@ -16,7 +16,7 @@ public interface ErpLarkRelationMainMapper { /** * 查询【请填写功能名称】 - * + * * @param id 【请填写功能名称】ID * @return 【请填写功能名称】 */ @@ -24,7 +24,7 @@ public interface ErpLarkRelationMainMapper /** * 查询【请填写功能名称】列表 - * + * * @param erpLarkRelation 【请填写功能名称】 * @return 【请填写功能名称】集合 */ @@ -32,7 +32,7 @@ public interface ErpLarkRelationMainMapper /** * 新增【请填写功能名称】 - * + * * @param erpLarkRelation 【请填写功能名称】 * @return 结果 */ @@ -40,7 +40,7 @@ public interface ErpLarkRelationMainMapper /** * 修改【请填写功能名称】 - * + * * @param erpLarkRelation 【请填写功能名称】 * @return 结果 */ @@ -49,7 +49,7 @@ public interface ErpLarkRelationMainMapper /** * 删除【请填写功能名称】 - * + * * @param id 【请填写功能名称】ID * @return 结果 */ @@ -57,7 +57,7 @@ public interface ErpLarkRelationMainMapper /** * 批量删除【请填写功能名称】 - * + * * @param ids 需要删除的数据ID * @return 结果 */ @@ -65,7 +65,7 @@ public interface ErpLarkRelationMainMapper public List queryListByKeyList(@Param("keyList") List keyList,@Param("method") String method); - public List queryListByKeyListAndRemark(@Param("keyList") List keyList,@Param("method") String method,@Param("remark") String remark); + public List queryListByKeyListAndRemark(@Param("keyList") List keyList,@Param("method") String method,@Param("remark") String remark,@Param("tableId") String tableId); public List queryWaitDeleteRecordList(@Param("currentDay") String currentDay,@Param("method") String method,@Param("remark") String remark); public void deleteRecordList(@Param("currentDay") String currentDay,@Param("method") String method,@Param("remark") String remark); /** diff --git a/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkRelationMainMapper.xml b/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkRelationMainMapper.xml index 0069884..d83575b 100644 --- a/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkRelationMainMapper.xml +++ b/ruoyi-flyingbook/src/main/resources/mapper/ErpLarkRelationMainMapper.xml @@ -6,6 +6,8 @@ + + @@ -18,7 +20,7 @@ - select id, key, method, create_by, create_time, update_by, update_time, flag, remark, lark_key + select id,cjt_id, `key`,lark_table, `method`, create_by, create_time, update_by, update_time, flag, remark, lark_key from erp_lark_relation_main @@ -26,10 +28,13 @@ resultMap="ErpLarkRelationResult"> - and key = #{key} - and method = #{method} + and cjt_id = #{cjtId} + and lark_table = #{larkTable} + and `key` = #{key} + and `method` = #{method} and lark_key = #{larkKey} and flag = #{flag} + and remark = #{remark} @@ -49,7 +54,7 @@ insert into erp_lark_relation_main - key, - method, + cjt_id, + cjt_id, + `key`, + `method`, create_by, create_time, update_by, @@ -92,6 +99,8 @@ lark_key, + #{cjtId}, + #{larkTable}, #{key}, #{method}, #{createBy}, @@ -105,11 +114,13 @@ - insert into erp_lark_relation_main(`key`,`method`,create_by,create_time,flag,lark_key,remark,update_time) + insert into erp_lark_relation_main(cjt_id,lark_table,`key`,`method`,create_by,create_time,flag,lark_key,remark,update_time) values ( - #{relation.key} + #{relation.cjtId} + ,#{relation.larkTable} + ,#{relation.key} ,#{relation.method} ,#{relation.createBy} ,#{relation.createTime} @@ -124,6 +135,8 @@ update erp_lark_relation_main + cjt_id = #{cjtId}, + lark_table = #{larkTable}, key = #{key}, method = #{method}, create_by = #{createBy}, diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java index 69b9996..a0a48a9 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java @@ -49,7 +49,7 @@ public abstract class SyncAccountsJobAbstract { @Autowired private RedisCache redisCache; @Autowired - protected ErpLarkRelationMapper erpLarkRelationMapper; + protected ErpLarkRelationMainMapper erpLarkRelationMapper; @Autowired private LarkCompanyRelationMapper larkCompanyRelationMapper; @Autowired