yanliming 5 rokov pred
rodič
commit
3b5602c875

+ 5 - 5
picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/InsuranceDefinitionLimit.java

@@ -17,7 +17,7 @@ public class InsuranceDefinitionLimit {
     @ApiModelProperty(value = "编号")
 	private String id;
     @ApiModelProperty(value = "险种信息ID")
-	private String definitionId;
+	private InsuranceDefinition definition;
     @ApiModelProperty(value = "限额名称")
 	private String name;
     @ApiModelProperty(value = "责任限额/免赔额")
@@ -55,15 +55,15 @@ public class InsuranceDefinitionLimit {
 	/**
 	 *获取险种信息ID
 	 */
-    	public String getDefinitionId(){
-		return definitionId;
+    	public InsuranceDefinition getDefinition(){
+		return definition;
 	}
 	
 	/**
 	 *设置险种信息ID
 	 */
-	public void setDefinitionId(String definitionId){
-		this.definitionId = definitionId;
+	public void setDefinition(InsuranceDefinition definition){
+		this.definition = definition;
 	}
 
 	/**

+ 7 - 7
picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/Jobs.java

@@ -16,8 +16,8 @@ import io.swagger.annotations.ApiModel;
 public class Jobs {
     @ApiModelProperty(value = "编号")
 	private String id;
-    @ApiModelProperty(value = "险种信息ID")
-	private String definitionId;
+    @ApiModelProperty(value = "险种信息")
+	private InsuranceDefinition definition;
     @ApiModelProperty(value = "名称")
 	private String name;
     @ApiModelProperty(value = "详细信息")
@@ -52,15 +52,15 @@ public class Jobs {
 	/**
 	 *获取险种信息ID
 	 */
-    	public String getDefinitionId(){
-		return definitionId;
+	public InsuranceDefinition getDefinition(){
+		return definition;
 	}
-	
+
 	/**
 	 *设置险种信息ID
 	 */
-	public void setDefinitionId(String definitionId){
-		this.definitionId = definitionId;
+	public void setDefinition(InsuranceDefinition definition){
+		this.definition = definition;
 	}
 
 	/**

+ 1 - 1
picc-common/src/main/resources/mapper/base/Jobs.xml

@@ -5,7 +5,6 @@
 <mapper namespace="com.jpsoft.picc.modules.base.dao.JobsDAO">
 	<resultMap id="JobsMap" type="com.jpsoft.picc.modules.base.entity.Jobs">
 		<id property="id" column="id_" />
-			<result property="definitionId" column="definition_id" />
 			<result property="name" column="name_" />
 			<result property="content" column="content_" />
 			<result property="status" column="status_" />
@@ -14,6 +13,7 @@
 			<result property="createTime" column="create_time" />
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
+			<association property="definition" column="definition_id" select="com.jpsoft.picc.modules.base.dao.InsuranceDefinitionDAO.get"></association>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.Jobs">
 	<!--