Skip to content

Y
yd-backend
Commit 72757a24 by jianan
Options

组织关系查询branchId

parent c441896f
Showing with 20 additions and 20 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java
...@@ -322,7 +322,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -322,7 +322,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
} }
private String generateKey(int targetUseFor) { private String generateKey(int targetUseFor) {
SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmss"); SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
return targetUseFor+sdf.format(new Date()) + CommonUtil.getRandomNum(3)+".jpg"; return targetUseFor+sdf.format(new Date()) + CommonUtil.getRandomNum(3)+".jpg";
} }
} }
yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringMembership.java
...@@ -71,7 +71,7 @@ public class AclPractitionerHiringMembership { ...@@ -71,7 +71,7 @@ public class AclPractitionerHiringMembership {
/** /**
* 分公司id * 分公司id
*/ */
private String branchPractitionerId; private String branchId;
/** /**
* 分公司 * 分公司
......
yd-api/src/main/resources/mapper/customer/AclPractitionerHiringMembershipMapper.xml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<result column="subsystem" jdbcType="VARCHAR" property="subsystem" /> <result column="subsystem" jdbcType="VARCHAR" property="subsystem" />
<result column="subsystem_owner_id" jdbcType="VARCHAR" property="subsystemOwnerId" /> <result column="subsystem_owner_id" jdbcType="VARCHAR" property="subsystemOwnerId" />
<result column="subsystem_owner" jdbcType="VARCHAR" property="subsystemOwner" /> <result column="subsystem_owner" jdbcType="VARCHAR" property="subsystemOwner" />
<result column="branch_practitioner_id" jdbcType="VARCHAR" property="branchPractitionerId" /> <result column="branch_id" jdbcType="VARCHAR" property="branchId" />
<result column="branch" jdbcType="VARCHAR" property="branch" /> <result column="branch" jdbcType="VARCHAR" property="branch" />
<result column="is_active" jdbcType="INTEGER" property="isActive" /> <result column="is_active" jdbcType="INTEGER" property="isActive" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" /> <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<!--@mbg.generated--> <!--@mbg.generated-->
id, hiring_basic_info_id, md_drop_option_id, md_drop_option_name, mentor_practitioner_id, id, hiring_basic_info_id, md_drop_option_id, md_drop_option_name, mentor_practitioner_id,
mentor, introducer_practitioner_id, introducer, subsystem_id, subsystem, subsystem_owner_id, mentor, introducer_practitioner_id, introducer, subsystem_id, subsystem, subsystem_owner_id,
subsystem_owner, branch_practitioner_id, branch, is_active, created_at, created_by, subsystem_owner, branch_id, branch, is_active, created_at, created_by,
updated_at, updated_by updated_at, updated_by
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
...@@ -58,14 +58,14 @@ ...@@ -58,14 +58,14 @@
md_drop_option_name, mentor_practitioner_id, md_drop_option_name, mentor_practitioner_id,
mentor, introducer_practitioner_id, introducer, mentor, introducer_practitioner_id, introducer,
subsystem_id, subsystem, subsystem_owner_id, subsystem_id, subsystem, subsystem_owner_id,
subsystem_owner, branch_practitioner_id, branch, subsystem_owner, branch_id, branch,
is_active, created_at, created_by, is_active, created_at, created_by,
updated_at, updated_by) updated_at, updated_by)
values (#{hiringBasicInfoId,jdbcType=BIGINT}, #{mdDropOptionId,jdbcType=BIGINT}, values (#{hiringBasicInfoId,jdbcType=BIGINT}, #{mdDropOptionId,jdbcType=BIGINT},
#{mdDropOptionName,jdbcType=VARCHAR}, #{mentorPractitionerId,jdbcType=VARCHAR}, #{mdDropOptionName,jdbcType=VARCHAR}, #{mentorPractitionerId,jdbcType=VARCHAR},
#{mentor,jdbcType=VARCHAR}, #{introducerPractitionerId,jdbcType=VARCHAR}, #{introducer,jdbcType=VARCHAR}, #{mentor,jdbcType=VARCHAR}, #{introducerPractitionerId,jdbcType=VARCHAR}, #{introducer,jdbcType=VARCHAR},
#{subsystemId,jdbcType=VARCHAR}, #{subsystem,jdbcType=VARCHAR}, #{subsystemOwnerId,jdbcType=VARCHAR}, #{subsystemId,jdbcType=VARCHAR}, #{subsystem,jdbcType=VARCHAR}, #{subsystemOwnerId,jdbcType=VARCHAR},
#{subsystemOwner,jdbcType=VARCHAR}, #{branchPractitionerId,jdbcType=VARCHAR}, #{branch,jdbcType=VARCHAR}, #{subsystemOwner,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR}, #{branch,jdbcType=VARCHAR},
#{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{isActive,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT},
#{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT}) #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT})
</insert> </insert>
...@@ -106,8 +106,8 @@ ...@@ -106,8 +106,8 @@
<if test="subsystemOwner != null"> <if test="subsystemOwner != null">
subsystem_owner, subsystem_owner,
</if> </if>
<if test="branchPractitionerId != null"> <if test="branchId != null">
branch_practitioner_id, branch_id,
</if> </if>
<if test="branch != null"> <if test="branch != null">
branch, branch,
...@@ -162,8 +162,8 @@ ...@@ -162,8 +162,8 @@
<if test="subsystemOwner != null"> <if test="subsystemOwner != null">
#{subsystemOwner,jdbcType=VARCHAR}, #{subsystemOwner,jdbcType=VARCHAR},
</if> </if>
<if test="branchPractitionerId != null"> <if test="branchId != null">
#{branchPractitionerId,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR},
</if> </if>
<if test="branch != null"> <if test="branch != null">
#{branch,jdbcType=VARCHAR}, #{branch,jdbcType=VARCHAR},
...@@ -222,8 +222,8 @@ ...@@ -222,8 +222,8 @@
<if test="subsystemOwner != null"> <if test="subsystemOwner != null">
subsystem_owner = #{subsystemOwner,jdbcType=VARCHAR}, subsystem_owner = #{subsystemOwner,jdbcType=VARCHAR},
</if> </if>
<if test="branchPractitionerId != null"> <if test="branchId != null">
branch_practitioner_id = #{branchPractitionerId,jdbcType=VARCHAR}, branch_id = #{branchId,jdbcType=VARCHAR},
</if> </if>
<if test="branch != null"> <if test="branch != null">
branch = #{branch,jdbcType=VARCHAR}, branch = #{branch,jdbcType=VARCHAR},
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
subsystem = #{subsystem,jdbcType=VARCHAR}, subsystem = #{subsystem,jdbcType=VARCHAR},
subsystem_owner_id = #{subsystemOwnerId,jdbcType=VARCHAR}, subsystem_owner_id = #{subsystemOwnerId,jdbcType=VARCHAR},
subsystem_owner = #{subsystemOwner,jdbcType=VARCHAR}, subsystem_owner = #{subsystemOwner,jdbcType=VARCHAR},
branch_practitioner_id = #{branchPractitionerId,jdbcType=VARCHAR}, branch_id = #{branchId,jdbcType=VARCHAR},
branch = #{branch,jdbcType=VARCHAR}, branch = #{branch,jdbcType=VARCHAR},
is_active = #{isActive,jdbcType=INTEGER}, is_active = #{isActive,jdbcType=INTEGER},
created_at = #{createdAt,jdbcType=TIMESTAMP}, created_at = #{createdAt,jdbcType=TIMESTAMP},
...@@ -328,9 +328,9 @@ ...@@ -328,9 +328,9 @@
when id = #{item.id,jdbcType=BIGINT} then #{item.subsystemOwner,jdbcType=VARCHAR} when id = #{item.id,jdbcType=BIGINT} then #{item.subsystemOwner,jdbcType=VARCHAR}
</foreach> </foreach>
</trim> </trim>
<trim prefix="branch_practitioner_id = case" suffix="end,"> <trim prefix="branch_id = case" suffix="end,">
<foreach collection="list" index="index" item="item"> <foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=BIGINT} then #{item.branchPractitionerId,jdbcType=VARCHAR} when id = #{item.id,jdbcType=BIGINT} then #{item.branchId,jdbcType=VARCHAR}
</foreach> </foreach>
</trim> </trim>
<trim prefix="branch = case" suffix="end,"> <trim prefix="branch = case" suffix="end,">
...@@ -450,10 +450,10 @@ ...@@ -450,10 +450,10 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="branch_practitioner_id = case" suffix="end,"> <trim prefix="branch_id = case" suffix="end,">
<foreach collection="list" index="index" item="item"> <foreach collection="list" index="index" item="item">
<if test="item.branchPractitionerId != null"> <if test="item.branchId != null">
when id = #{item.id,jdbcType=BIGINT} then #{item.branchPractitionerId,jdbcType=VARCHAR} when id = #{item.id,jdbcType=BIGINT} then #{item.branchId,jdbcType=VARCHAR}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -510,7 +510,7 @@ ...@@ -510,7 +510,7 @@
insert into ag_acl_practitioner_hiring_membership insert into ag_acl_practitioner_hiring_membership
(hiring_basic_info_id, md_drop_option_id, md_drop_option_name, mentor_practitioner_id, (hiring_basic_info_id, md_drop_option_id, md_drop_option_name, mentor_practitioner_id,
mentor, introducer_practitioner_id, introducer, subsystem_id, subsystem, subsystem_owner_id, mentor, introducer_practitioner_id, introducer, subsystem_id, subsystem, subsystem_owner_id,
subsystem_owner, branch_practitioner_id, branch, is_active, created_at, created_by, subsystem_owner, branch_id, branch, is_active, created_at, created_by,
updated_at, updated_by) updated_at, updated_by)
values values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
...@@ -519,7 +519,7 @@ ...@@ -519,7 +519,7 @@
#{item.mentor,jdbcType=VARCHAR}, #{item.introducerPractitionerId,jdbcType=VARCHAR}, #{item.mentor,jdbcType=VARCHAR}, #{item.introducerPractitionerId,jdbcType=VARCHAR},
#{item.introducer,jdbcType=VARCHAR}, #{item.subsystemId,jdbcType=VARCHAR}, #{item.subsystem,jdbcType=VARCHAR}, #{item.introducer,jdbcType=VARCHAR}, #{item.subsystemId,jdbcType=VARCHAR}, #{item.subsystem,jdbcType=VARCHAR},
#{item.subsystemOwnerId,jdbcType=VARCHAR}, #{item.subsystemOwner,jdbcType=VARCHAR}, #{item.subsystemOwnerId,jdbcType=VARCHAR}, #{item.subsystemOwner,jdbcType=VARCHAR},
#{item.branchPractitionerId,jdbcType=VARCHAR}, #{item.branch,jdbcType=VARCHAR}, #{item.branchId,jdbcType=VARCHAR}, #{item.branch,jdbcType=VARCHAR},
#{item.isActive,jdbcType=INTEGER}, #{item.createdAt,jdbcType=TIMESTAMP}, #{item.createdBy,jdbcType=BIGINT}, #{item.isActive,jdbcType=INTEGER}, #{item.createdAt,jdbcType=TIMESTAMP}, #{item.createdBy,jdbcType=BIGINT},
#{item.updatedAt,jdbcType=TIMESTAMP}, #{item.updatedBy,jdbcType=BIGINT}) #{item.updatedAt,jdbcType=TIMESTAMP}, #{item.updatedBy,jdbcType=BIGINT})
</foreach> </foreach>
......
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