[task-3192]调班接口调整

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  overview;       /*概览*/
 	@ApiModelProperty(value = "排班ID")
 	protected String  scheduleId;     /*排班ID*/
+	@ApiModelProperty(value = "调班类型")
+	protected String  type;     /*调班类型*/
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
 
 	public String getOverview() {
 		return overview;

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/provider/AdjustmentProvider.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.lc.ibps.components.employee.persistence.entity.AdjustmentDetailPo;
+import com.lc.ibps.components.employee.repository.AdjustmentDetailRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -44,6 +46,9 @@ public class AdjustmentProvider extends GenericProvider implements IAdjustmentSe
 	@Resource
 	private AdjustmentRepository adjustmentRepository;
 
+	@Resource
+	private AdjustmentDetailRepository adjustmentDetailRepository;
+
 	@ApiOperation(value = "调班申请表列表(分页条件查询)数据", notes = "调班申请表列表(分页条件查询)数据")
 	@Override
 	public APIResult<APIPageList<AdjustmentPo>> query(
@@ -53,6 +58,11 @@ public class AdjustmentProvider extends GenericProvider implements IAdjustmentSe
 		try {
 			QueryFilter queryFilter = getQueryFilter(request);
 			List<AdjustmentPo> data = adjustmentRepository.query(queryFilter);
+			if(data != null && !data.isEmpty()){
+				for(AdjustmentPo po : data){
+					po.setAdjustmentDetailPoList(adjustmentDetailRepository.findByMainId(po.getId()));
+				}
+			}
 			APIPageList<AdjustmentPo> apiPageData = getAPIPageList(data);
 			result.setData(apiPageData);
 		} catch (Exception e) {

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

@@ -17,10 +17,11 @@
 		<result property="executeDate" column="EXECUTE_DATE_" jdbcType="VARCHAR"/>
 		<result property="overview" column="OVERVIEW_" jdbcType="VARCHAR"/>
 		<result property="scheduleId" column="SCHEDULE_ID_" jdbcType="VARCHAR"/>
+		<result property="type" column="type_" 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_
+		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,DI_DIAN_,REASON_,STATUS,EXECUTOR_,EXECUTE_DATE_,OVERVIEW_,SCHEDULE_ID_,TYPE_
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.AdjustmentPo">
@@ -29,7 +30,7 @@
 		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})
+		#{executor,jdbcType=VARCHAR}, #{executeDate,jdbcType=VARCHAR},#{overview,jdbcType=VARCHAR}, #{scheduleId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}))
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="AdjustmentPo">
@@ -83,7 +84,8 @@
 		EXECUTOR_=#{executor,jdbcType=VARCHAR},
 		EXECUTE_DATE_=#{executeDate,jdbcType=VARCHAR},
 		OVERVIEW_=#{overview,jdbcType=VARCHAR},
-		SCHEDULE_ID_=#{scheduleId,jdbcType=VARCHAR}
+		SCHEDULE_ID_=#{scheduleId,jdbcType=VARCHAR},
+		TYPE_=#{type,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>