[bug-2693]调班申请子表父表需要增加拒绝原因字段，接口应补充

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/AdjustmentDetailTbl.java

@@ -40,6 +40,16 @@ public class AdjustmentDetailTbl extends AbstractPo<String>{
 	protected String  party; 		/*当事人*/
 	@ApiModelProperty(value = "审核时间")
 	protected String  auditTime; 		/*审核时间*/
+	@ApiModelProperty(value = "拒绝原因")
+	protected String  rejectReason;     /*拒绝原因*/
+
+	public String getRejectReason() {
+		return rejectReason;
+	}
+
+	public void setRejectReason(String rejectReason) {
+		this.rejectReason = rejectReason;
+	}
 
 	public void setId(String id) 
 	{

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/AdjustmentTbl.java

@@ -38,6 +38,16 @@ public class AdjustmentTbl extends AbstractPo<String>{
 	protected String  scheduleId;     /*排班ID*/
 	@ApiModelProperty(value = "调班类型")
 	protected String  type;     /*调班类型*/
+	@ApiModelProperty(value = "拒绝原因")
+	protected String  rejectReason;     /*拒绝原因*/
+
+	public String getRejectReason() {
+		return rejectReason;
+	}
+
+	public void setRejectReason(String rejectReason) {
+		this.rejectReason = rejectReason;
+	}
 
 	public String getType() {
 		return type;

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/Adjustment.map.xml

@@ -18,10 +18,11 @@
 		<result property="overview" column="OVERVIEW_" jdbcType="VARCHAR"/>
 		<result property="scheduleId" column="SCHEDULE_ID_" jdbcType="VARCHAR"/>
 		<result property="type" column="type_" jdbcType="VARCHAR"/>
+		<result property="rejectReason" column="reject_reason_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,DI_DIAN_,REASON_,STATUS,EXECUTOR_,EXECUTE_DATE_,OVERVIEW_,SCHEDULE_ID_,TYPE_
+		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,DI_DIAN_,REASON_,STATUS,EXECUTOR_,EXECUTE_DATE_,OVERVIEW_,SCHEDULE_ID_,TYPE_,REJECT_REASON_
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.AdjustmentPo">
@@ -30,7 +31,8 @@
 		VALUES 
 		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
 		#{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{diDian,jdbcType=VARCHAR}, #{reason,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
-		#{executor,jdbcType=VARCHAR}, #{executeDate,jdbcType=VARCHAR},#{overview,jdbcType=VARCHAR}, #{scheduleId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR})
+		#{executor,jdbcType=VARCHAR}, #{executeDate,jdbcType=VARCHAR},#{overview,jdbcType=VARCHAR}, #{scheduleId,jdbcType=VARCHAR},
+		#{type,jdbcType=VARCHAR},#{rejectReason,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="AdjustmentPo">
@@ -85,7 +87,8 @@
 		EXECUTE_DATE_=#{executeDate,jdbcType=VARCHAR},
 		OVERVIEW_=#{overview,jdbcType=VARCHAR},
 		SCHEDULE_ID_=#{scheduleId,jdbcType=VARCHAR},
-		TYPE_=#{type,jdbcType=VARCHAR}
+		TYPE_=#{type,jdbcType=VARCHAR},
+		REJECT_REASON_=#{rejectReason,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/AdjustmentDetail.map.xml

@@ -19,17 +19,21 @@
 		<result property="status" column="STATUS_" jdbcType="VARCHAR"/>
 		<result property="party" column="PARTY_" jdbcType="VARCHAR"/>
 		<result property="auditTime" column="AUDIT_TIME_" jdbcType="VARCHAR"/>
+		<result property="rejectReason" column="reject_reason_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,RECORD_ID_,BEFORE_ADJUST_,BEFORE_DATE_,AFTER_ADJUST_,AFTER_DATE_,STATUS_,PARTY_,AUDIT_TIME_
+		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,RECORD_ID_,BEFORE_ADJUST_,BEFORE_DATE_,AFTER_ADJUST_,AFTER_DATE_,STATUS_,PARTY_,AUDIT_TIME_,REJECT_REASON_
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.AdjustmentDetailPo">
 		INSERT INTO T_ADJUSTMENT_DETAIL
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{recordId,jdbcType=VARCHAR}, #{beforeAdjust,jdbcType=VARCHAR}, #{beforeDate,jdbcType=VARCHAR}, #{afterAdjust,jdbcType=VARCHAR}, #{afterDate,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{party,jdbcType=VARCHAR}, #{auditTime,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
+		#{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{recordId,jdbcType=VARCHAR},
+		#{beforeAdjust,jdbcType=VARCHAR}, #{beforeDate,jdbcType=VARCHAR}, #{afterAdjust,jdbcType=VARCHAR}, #{afterDate,jdbcType=VARCHAR},
+		#{status,jdbcType=VARCHAR}, #{party,jdbcType=VARCHAR}, #{auditTime,jdbcType=VARCHAR},#{rejectReason,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="AdjustmentDetailPo">
@@ -85,7 +89,8 @@
 		AFTER_DATE_=#{afterDate,jdbcType=VARCHAR},
 		STATUS_=#{status,jdbcType=VARCHAR},
 		PARTY_=#{party,jdbcType=VARCHAR},
-		AUDIT_TIME_=#{auditTime,jdbcType=VARCHAR}
+		AUDIT_TIME_=#{auditTime,jdbcType=VARCHAR},
+		REJECT_REASON_=#{rejectReason,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>