Przeglądaj źródła

[task-4045]排班记录的接口需增加字段,用以支持排班复用。

szjbdgzl 1 rok temu
rodzic
commit
bd84250a7e

+ 10 - 0
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/StaffScheduleTbl.java

@@ -46,6 +46,16 @@ public class StaffScheduleTbl extends AbstractPo<String>{
 	protected String  config; 		/*排班配置*/
 	@ApiModelProperty(value = "排班类型")
 	protected String  type; 		/*排班类型*/
+	@ApiModelProperty(value = "选择排班")
+	protected String  oldScheduleId; 	/*选择排班*/
+
+	public String getOldScheduleId() {
+		return oldScheduleId;
+	}
+
+	public void setOldScheduleId(String oldScheduleId) {
+		this.oldScheduleId = oldScheduleId;
+	}
 
 	public String getConfig() {
 		return config;

+ 7 - 3
ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/StaffSchedule.map.xml

@@ -23,10 +23,12 @@
 		<result property="status" column="STATUS_" jdbcType="VARCHAR"/>
 		<result property="config" column="CONFIG_" jdbcType="BLOB"/>
 		<result property="type" column="TYPE_" jdbcType="VARCHAR"/>
+		<result property="oldScheduleId" column="OLD_SCHEDULE_ID_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,DI_DIAN_,TITLE_,SCOPE_,SCOPE_ID_,CYCLE_,START_DATE_,END_DATE_,USER_TYPE_,STATUS_,OVERVIEW_,CONFIG_,TYPE_
+		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,DI_DIAN_,TITLE_,SCOPE_,SCOPE_ID_,CYCLE_,START_DATE_,END_DATE_,USER_TYPE_,STATUS_,OVERVIEW_,CONFIG_,TYPE_,OLD_SCHEDULE_ID_
+
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.StaffSchedulePo">
@@ -36,7 +38,8 @@
 		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
 		#{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{diDian,jdbcType=VARCHAR},
 		#{title,jdbcType=VARCHAR}, #{scope,jdbcType=VARCHAR}, #{scopeId,jdbcType=VARCHAR}, #{cycle,jdbcType=VARCHAR}, #{startDate,jdbcType=VARCHAR},
-		#{endDate,jdbcType=VARCHAR}, #{userType,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{overview,jdbcType=BLOB}, #{config,jdbcType=BLOB}, #{type,jdbcType=VARCHAR})
+		#{endDate,jdbcType=VARCHAR}, #{userType,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{overview,jdbcType=BLOB},
+		#{config,jdbcType=BLOB}, #{type,jdbcType=VARCHAR}, #{oldScheduleId,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="StaffSchedulePo">
@@ -95,7 +98,8 @@
 		STATUS_=#{status,jdbcType=VARCHAR},
 		OVERVIEW_=#{overview,jdbcType=BLOB},
 		CONFIG_=#{config,jdbcType=BLOB},
-		TYPE_=#{type,jdbcType=VARCHAR}
+		TYPE_=#{type,jdbcType=VARCHAR},
+		OLD_SCHEDULE_ID_=#{oldScheduleId,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>