Skip to content

Y
yd-backend
Commit 1b4a9b45 by Water Wang
Options

resolve conflict

parents 2a40f262 ec171b5e
Showing with 52 additions and 19 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
......@@ -538,7 +538,7 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
for(AclPractitionerPotentialAssignedTrack item : assignedTrackIsLastedList){
item.setIsLasted(0);
item.setUpdatedBy(practitionerId);
item.setUpdatorType(2);
item.setUpdaterType(2);
item.setUpdatedAt(new Date());
assignedTrackUpdateList.add(item);
}
......
yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerPotential.java
......@@ -114,7 +114,7 @@ public class AclPractitionerPotential implements Serializable {
private Integer creatorType;
private Integer updatorType;
private Integer updaterType;
private Long customerId;
}
\ No newline at end of file
yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerPotentialAssignedTrack.java
......@@ -62,7 +62,7 @@ public class AclPractitionerPotentialAssignedTrack implements Serializable {
private Integer creatorType;
private Integer updatorType;
private Integer updaterType;
private Integer isLasted;
......
yd-api/src/main/resources/mapper/customer/AclPractitionerPotentialAssignedTrackMapper.xml
......@@ -12,7 +12,7 @@
<result column="created_by" jdbcType="BIGINT" property="createdBy" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
<result column="updator_type" jdbcType="INTEGER" property="updatorType" />
<result column="updater_type" jdbcType="INTEGER" property="updaterType" />
<result column="creator_type" jdbcType="INTEGER" property="creatorType" />
<result column="is_lasted" jdbcType="INTEGER" property="isLasted" />
<result column="track_score" jdbcType="INTEGER" property="trackScore" />
......@@ -63,11 +63,11 @@
insert into ag_acl_practitioner_potential_assigned_track (practitioner_potential_id, practitioner_assigned_id,
track_status_id, track_score,notice, is_active,
created_at, created_by, updated_at,
updated_by, updator_type,creator_type,is_lasted )
updated_by, updater_type,creator_type,is_lasted )
values (#{practitionerPotentialId,jdbcType=BIGINT}, #{practitionerAssignedId,jdbcType=BIGINT},
#{trackStatusId,jdbcType=BIGINT},#{trackScore,jdbcType=INTEGER}, #{notice,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER},
#{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP},
#{updatedBy,jdbcType=BIGINT},#{updatorType,jdbcType=INTEGER}, #{creatorType,jdbcType=INTEGER},#{isLasted,jdbcType=INTEGER})
#{updatedBy,jdbcType=BIGINT},#{updaterType,jdbcType=INTEGER}, #{creatorType,jdbcType=INTEGER},#{isLasted,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitionerPotentialAssignedTrack" useGeneratedKeys="true">
insert into ag_acl_practitioner_potential_assigned_track
......@@ -105,8 +105,8 @@
<if test="creatorType != null">
creator_type,
</if>
<if test="updatorType != null">
updator_type,
<if test="updaterType != null">
updater_type,
</if>
<if test="isLasted != null">
is_lasted,
......@@ -144,10 +144,10 @@
#{updatedBy,jdbcType=BIGINT},
</if>
<if test="creatorType != null">
#{creatorType,jdbcType=BIGINT},
#{creatorType,jdbcType=INTEGER},
</if>
<if test="updatorType != null">
#{updatorType,jdbcType=BIGINT},
<if test="updaterType != null">
#{updaterType,jdbcType=INTEGER},
</if>
<if test="isLasted != null">
#{isLasted,jdbcType=INTEGER},
......@@ -158,7 +158,7 @@
insert into ag_acl_practitioner_potential_assigned_track(practitioner_potential_id, practitioner_assigned_id,
track_status_id, track_score,notice, is_active,
created_at, created_by, updated_at,
updated_by, updator_type,creator_type,is_lasted )
updated_by, updater_type,creator_type,is_lasted )
values
<foreach collection="potentialAssignedTrackList" item="item" index="index" separator=",">
(
......@@ -172,7 +172,7 @@
#{item.createdBy},
#{item.updatedAt},
#{item.updatedBy},
#{item.updatorType},
#{item.updaterType},
#{item.creatorType},
#{item.isLasted}
)
......@@ -211,6 +211,15 @@
<if test="updatedBy != null">
updated_by = #{updatedBy,jdbcType=BIGINT},
</if>
<if test="updaterType != null">
updater_type = #{updaterType,jdbcType=TIMESTAMP},
</if>
<if test="creatorType != null">
creator_type = #{creatorType,jdbcType=BIGINT},
</if>
<if test="isLasted != null">
is_lasted = #{isLasted,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
......@@ -224,7 +233,10 @@
created_at = #{createdAt,jdbcType=TIMESTAMP},
created_by = #{createdBy,jdbcType=BIGINT},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
updated_by = #{updatedBy,jdbcType=BIGINT}
updated_by = #{updatedBy,jdbcType=BIGINT},
updater_type = #{updaterType,jdbcType=INTEGER},
creator_type = #{creatorType,jdbcType=INTEGER},
is_lasted = #{isLasted,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateAll" parameterType="java.util.List">
......
yd-api/src/main/resources/mapper/customer/AclPractitionerPotentialMapper.xml
......@@ -24,12 +24,12 @@
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
<result column="creator_type" jdbcType="BIGINT" property="creatorType" />
<result column="updator_type" jdbcType="BIGINT" property="updatorType" />
<result column="updater_type" jdbcType="BIGINT" property="updaterType" />
</resultMap>
<sql id="Base_Column_List">
id, customer_id,`name`, age, gender, mobile_no, wechat_id, qq_id, others_contacts, education_level,
introducer, tag, remark, resource_drop_master_id, oss_path_resume, practitioner_assigned_ids,
is_active, created_at, created_by, updated_at, updated_by,creator_type,updator_type
is_active, created_at, created_by, updated_at, updated_by,creator_type,updater_type
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
......@@ -48,14 +48,14 @@
tag, remark, resource_drop_master_id,
oss_path_resume, practitioner_assigned_ids, is_active,
created_at, created_by, updated_at,
updated_by)
updated_by,updater_type,creator_type)
values (#{name,jdbcType=VARCHAR},#{customerId,jdbcType=BIGINT}, #{age,jdbcType=BIGINT}, #{gender,jdbcType=INTEGER},
#{mobileNo,jdbcType=VARCHAR}, #{wechatId,jdbcType=VARCHAR}, #{qqId,jdbcType=VARCHAR},
#{othersContacts,jdbcType=VARCHAR}, #{educationLevel,jdbcType=VARCHAR}, #{introducer,jdbcType=VARCHAR},
#{tag,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{resourceDropMasterId,jdbcType=BIGINT},
#{ossPathResume,jdbcType=VARCHAR}, #{practitionerAssignedIds,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER},
#{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP},
#{updatedBy,jdbcType=BIGINT})
#{updatedBy,jdbcType=BIGINT},#{updaterType,jdbcType=INTEGER},#{creatorType,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitionerPotential" useGeneratedKeys="true">
insert into ag_acl_practitioner_potential
......@@ -117,6 +117,12 @@
<if test="updatedBy != null">
updated_by,
</if>
<if test="creatorType != null">
creator_type,
</if>
<if test="updaterType != null">
updater_type,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">
......@@ -176,6 +182,12 @@
<if test="updatedBy != null">
#{updatedBy,jdbcType=BIGINT},
</if>
<if test="creatorType != null">
#{creatorType,jdbcType=INTEGER},
</if>
<if test="updaterType != null">
#{updaterType,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.customer.AclPractitionerPotential">
......@@ -238,6 +250,12 @@
<if test="updatedBy != null">
updated_by = #{updatedBy,jdbcType=BIGINT},
</if>
<if test="creatorType != null">
creator_type = #{creatorType,jdbcType=INTEGER},
</if>
<if test="updaterType != null">
updater_type = #{updaterType,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
......@@ -261,7 +279,9 @@
created_at = #{createdAt,jdbcType=TIMESTAMP},
created_by = #{createdBy,jdbcType=BIGINT},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
updated_by = #{updatedBy,jdbcType=BIGINT}
updated_by = #{updatedBy,jdbcType=BIGINT},
creator_type = #{creatorType,jdbcType=INTEGER},
updater_type = #{updaterType,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="findByMobileNo" resultMap="BaseResultMap">
......
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