From 1790ad11674c24f9b86f997d178b9ca443340853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 22 Mar 2024 18:58:12 +0800 Subject: [PATCH 1/4] pc --- .../store/enums/WorkflowSubStageEnum.java | 2 +- .../resources/mapper/HyPartnerLabelMapper.xml | 22 ++++++------- .../impl/JoinIntentionServiceImpl.java | 31 ++++++++++++++++++- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java index 0fa2353ac..d70fb9b57 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageEnum.java @@ -10,7 +10,7 @@ public enum WorkflowSubStageEnum{ /** * 流程子阶段枚举 */ - INTEND(1, "加盟意向申请", WorkflowSubStageStatusEnum.INTENT_0,null), + INTEND(1, "加盟意向申请", WorkflowSubStageStatusEnum.INTENT_0,"joinIntentionServiceImpl"), INVITING_INTERVIEWS(5, "邀约面谈", WorkflowSubStageStatusEnum.INVITING_INTERVIEWS_10, "lineInterviewServiceImpl"), FIRST_INTERVIEWS(10, "一审面试", WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_25, "lineInterviewServiceImpl"), PAY_DEPOSIT(15, "缴纳意向金", WorkflowSubStageStatusEnum.PAY_DEPOSIT_45, null), diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml index d7773f9a4..988706756 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLabelMapper.xml @@ -21,7 +21,7 @@ select - from hxfg_partner_label + from xfsg__partner_label where deleted = 0 and label_group_id = #{labelGroupId} @@ -62,11 +62,11 @@ - delete from hxfg_partner_label + delete from xfsg__partner_label where id = #{id} - insert into hxfg_partner_label (id, label_group_id, label_name, + insert into xfsg__partner_label (id, label_group_id, label_name, edit_user_id, edit_date, deleted, create_time, update_time, create_user_id, update_user_id, remark) @@ -76,7 +76,7 @@ #{updateUserId}, #{remark}) - insert into hxfg_partner_label + insert into xfsg__partner_label id, @@ -149,7 +149,7 @@ - update hxfg_partner_label + update xfsg__partner_label label_group_id = #{labelGroupId}, @@ -186,7 +186,7 @@ and id = #{id} - update hxfg_partner_label + update xfsg__partner_label set label_group_id = #{labelGroupId}, label_name = #{labelName}, edit_user_id = #{editUserId}, @@ -202,8 +202,8 @@ SELECT COUNT(*) - FROM hxfg_partner_label + FROM xfsg__partner_label WHERE deleted = 0 AND label_group_id = #{labelGroupId} select - from xfsg__partner_label + from xfsg_partner_label where deleted = 0 and id = #{id} order by create_time desc @@ -29,7 +29,7 @@ - delete from xfsg__partner_label + delete from xfsg_partner_label where id = #{id} - insert into xfsg__partner_label (id, label_group_id, label_name, + insert into xfsg_partner_label (id, label_group_id, label_name, edit_user_id, edit_date, deleted, create_time, update_time, create_user_id, update_user_id, remark) @@ -76,7 +76,7 @@ #{updateUserId}, #{remark}) - insert into xfsg__partner_label + insert into xfsg_partner_label id, @@ -149,7 +149,7 @@ - update xfsg__partner_label + update xfsg_partner_label label_group_id = #{labelGroupId}, @@ -186,7 +186,7 @@ and id = #{id} - update xfsg__partner_label + update xfsg_partner_label set label_group_id = #{labelGroupId}, label_name = #{labelName}, edit_user_id = #{editUserId}, @@ -202,8 +202,8 @@ SELECT COUNT(*) - FROM xfsg__partner_label + FROM xfsg_partner_label WHERE deleted = 0 AND label_group_id = #{labelGroupId} SELECT t1.id, t1.label_group_name, t2.`name` AS editName, t2.mobile AS editMobile, t1.edit_date FROM xfsg_partner_label_group t1 - LEFT JOIN enterprise_user t2 ON t1.edit_user_id = t2.user_id + LEFT JOIN enterprise_user_${enterpriseId} t2 ON t1.edit_user_id = t2.user_id WHERE t1.deleted = 0 AND t1.label_group_name LIKE CONCAT('%', #{labelGroupName}, '%') @@ -226,7 +226,7 @@