添加字段

picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/InsuranceDefinition.java

@@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
 import java.util.List;
 
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,6 +15,7 @@ import io.swagger.annotations.ApiModel;
 /**
   描述:base_insurance_definition的实体类
  */
+@Data
 @ApiModel(value = "base_insurance_definition的实体类")
 public class InsuranceDefinition {
     @ApiModelProperty(value = "编号")
@@ -30,10 +32,14 @@ public class InsuranceDefinition {
 	private Boolean delFlag;
     @ApiModelProperty(value = "创建人")
 	private String createBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "创建时间")
 	private Date createTime;
     @ApiModelProperty(value = "修改人")
 	private String updateBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 	@ApiModelProperty(value = "下月保单生效前提前多少天通知")
@@ -43,189 +49,16 @@ public class InsuranceDefinition {
     private List<InsuranceDefinitionLimit> limits;
 	@ApiModelProperty(value = "理赔须知")
 	private String notice;
-
-    /**
-	 *获取编号
-	 */
-    	public String getId(){
-		return id;
-	}
-	
-	/**
-	 *设置编号
-	 */
-	public void setId(String id){
-		this.id = id;
-	}
-
-	/**
-	 *获取险种
-	 */
-    	public String getName(){
-		return name;
-	}
-	
-	/**
-	 *设置险种
-	 */
-	public void setName(String name){
-		this.name = name;
-	}
-	/**
-	 *获取投保声明
-	 */
-    	public String getInsuranceDescription(){
-		return insuranceDescription;
-	}
-	
-	/**
-	 *设置投保声明
-	 */
-	public void setInsuranceDescription(String insuranceDescription){
-		this.insuranceDescription = insuranceDescription;
-	}
-
-	/**
-	 *获取雇主责任险条款
-	 */
-    	public String getClause(){
-		return clause;
-	}
-	
-	/**
-	 *设置雇主责任险条款
-	 */
-	public void setClause(String clause){
-		this.clause = clause;
-	}
-
-	/**
-	 *获取状态
-	 */
-    	public String getStatus(){
-		return status;
-	}
-	
-	/**
-	 *设置状态
-	 */
-	public void setStatus(String status){
-		this.status = status;
-	}
-
-	/**
-	 *获取是否删除
-	 */
-    	public Boolean getDelFlag(){
-		return delFlag;
-	}
-	
-	/**
-	 *设置是否删除
-	 */
-	public void setDelFlag(Boolean delFlag){
-		this.delFlag = delFlag;
-	}
-
-	/**
-	 *获取创建人
-	 */
-	public String getCreateBy(){
-		return createBy;
-	}
-	
-	/**
-	 *设置创建人
-	 */
-	public void setCreateBy(String createBy){
-		this.createBy = createBy;
-	}
-	/**
-	 *获取创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-		public Date getCreateTime(){
-		return createTime;
-	}
-	
-	/**
-	 *设置创建时间
-	 */
-	public void setCreateTime(Date createTime){
-		this.createTime = createTime;
-	}
-
-	/**
-	 *获取修改人
-	 */
-	public String getUpdateBy(){
-		return updateBy;
-	}
-	
-	/**
-	 *设置修改人
-	 */
-	public void setUpdateBy(String updateBy){
-		this.updateBy = updateBy;
-	}
-	/**
-	 *获取修改时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-		public Date getUpdateTime(){
-		return updateTime;
-	}
-	
-	/**
-	 *设置修改时间
-	 */
-	public void setUpdateTime(Date updateTime){
-		this.updateTime = updateTime;
-	}
-
-	public List<InsuranceDefinitionLimit> getLimits(){
-		return limits;
-	}
-	public void setLimits(List<InsuranceDefinitionLimit> id){
-		this.limits = limits;
-	}
-
-
-	/**
-	 *获取截止时间
-	 */
-	public String getCutOffTime(){
-		return cutOffTime;
-	}
-
-	/**
-	 *设置截止时间
-	 */
-	public void setCutOffTime(String cutOffTime){
-		this.cutOffTime = cutOffTime;
-	}
-
-	/**
-	 *获取理赔须知
-	 */
-	public String getNotice(){
-		return notice;
-	}
-
-	/**
-	 *设置理赔须知
-	 */
-	public void setNotice(String notice){
-		this.notice = notice;
-	}
-
-	public Integer getAdvanceSubmitDays() {
-		return advanceSubmitDays;
-	}
-
-	public void setAdvanceSubmitDays(Integer advanceSubmitDays) {
-		this.advanceSubmitDays = advanceSubmitDays;
-	}
+	@ApiModelProperty(value = "致家长的一封信")
+	private String letter;
+	@ApiModelProperty(value = "特别声明")
+	private String specialStatement;
+	@ApiModelProperty(value = "责任免除说明")
+	private String exemptionInstructions;
+	@ApiModelProperty(value = "保险责任文本")
+	private String responsibility;
+	@ApiModelProperty(value = "附加险保险责任文本")
+	private String responsibilityAttach;
+	@ApiModelProperty(value = "是否拥有附加险")
+	private Boolean haveAttach;
 }

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
 
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,6 +14,7 @@ import io.swagger.annotations.ApiModel;
 /**
  * 描述:base_insurance_definition_limit的实体类
  */
+@Data
 @ApiModel(value = "base_insurance_definition_limit的实体类")
 public class InsuranceDefinitionLimit {
     @ApiModelProperty(value = "编号")
@@ -33,192 +35,26 @@ public class InsuranceDefinitionLimit {
     private Boolean delFlag;
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
     @ApiModelProperty(value = "修改人")
     private String updateBy;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
     @ApiModelProperty(value = "序号")
     private Integer sortNo;
 
-    /**
-     * 获取编号
-     */
-    public String getId() {
-        return id;
-    }
+    @ApiModelProperty(value = "累计/每次责任限额")
+    private String singleLimit ;
+    @ApiModelProperty(value = "适用条款")
+    private String terms ;
+    @ApiModelProperty(value = "免赔额")
+    private String deductible ;
+    @ApiModelProperty(value = "是否附加险")
+    private Boolean isAttach ;
 
-    /**
-     * 设置编号
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取险种信息
-     */
-    public String getDefinitionId() {
-        return definitionId;
-    }
-
-    /**
-     * 获取险种信息
-     */
-    public void setDefinitionId(String definitionId) {
-        this.definitionId = definitionId;
-    }
-
-    /**
-     * 获取险种信息
-     */
-    public InsuranceDefinition getDefinition() {
-        return definition;
-    }
-
-    /**
-     * 设置险种信息
-     */
-    public void setDefinition(InsuranceDefinition definition) {
-        this.definition = definition;
-    }
-
-    /**
-     * 获取限额名称
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置限额名称
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取责任限额/免赔额
-     */
-    public String getLimit() {
-        return limit;
-    }
-
-    /**
-     * 设置责任限额/免赔额
-     */
-    public void setLimit(String limit) {
-        this.limit = limit;
-    }
-
-    /**
-     * 获取计算单位(次/元/人/万)
-     */
-    public String getUnit() {
-        return unit;
-    }
-
-    /**
-     * 设置计算单位(次/元/人/万)
-     */
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    /**
-     * 获取状态
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态
-     */
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取是否删除
-     */
-    public Boolean getDelFlag() {
-        return delFlag;
-    }
-
-    /**
-     * 设置是否删除
-     */
-    public void setDelFlag(Boolean delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    /**
-     * 获取创建人
-     */
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    /**
-     * 设置创建人
-     */
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    /**
-     * 获取创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取修改人
-     */
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    /**
-     * 设置修改人
-     */
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    /**
-     * 获取修改时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 设置修改时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getSortNo() {
-        return sortNo;
-    }
-
-    public void setSortNo(Integer sortNo) {
-        this.sortNo = sortNo;
-    }
 }

picc-common/src/main/resources/mapper/base/InsuranceDefinition.xml

@@ -17,6 +17,12 @@
         <result property="cutOffTime" column="cut_off_time"/>
         <result property="advanceSubmitDays" column="advance_submit_days"/>
         <result property="notice" column="notice_"/>
+        <result property="letter" column="letter_ "/>
+        <result property="specialStatement" column="special_statement "/>
+        <result property="exemptionInstructions" column="exemption_instructions "/>
+        <result property="responsibility" column="responsibility_ "/>
+        <result property="responsibilityAttach" column="responsibility_attach "/>
+        <result property="haveAttach" column="have_attach "/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.InsuranceDefinition">
         <!--
@@ -27,7 +33,9 @@
         <![CDATA[
 		insert into base_insurance_definition
 	    (id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,
-	    update_by,update_time,cut_off_time,notice_,advance_submit_days)
+	    update_by,update_time,cut_off_time,notice_,advance_submit_days,
+	    letter_ ,special_statement ,exemption_instructions ,responsibility_ ,responsibility_attach ,have_attach
+	    )
 		values
 		(
 			#{id,jdbcType=VARCHAR}
@@ -43,6 +51,12 @@
 			,#{cutOffTime,jdbcType= VARCHAR }
 			,#{notice,jdbcType= VARCHAR }
 			,#{advanceSubmitDays, jdbcType=NUMERIC}
+			,#{letter,jdbcType= VARCHAR }
+			,#{specialStatement,jdbcType= VARCHAR }
+			,#{exemptionInstructions,jdbcType= VARCHAR }
+			,#{responsibility,jdbcType= VARCHAR }
+			,#{responsibilityAttach,jdbcType= VARCHAR }
+			,#{haveAttach,jdbcType= NUMERIC }
 		)
 	]]>
     </insert>
@@ -88,14 +102,29 @@
             <if test="advanceSubmitDays!=null">
                 advance_submit_days=#{advanceSubmitDays,jdbcType= NUMERIC },
             </if>
+            <if test="letter!=null">
+                letter_ =#{letter,jdbcType= VARCHAR },
+            </if>
+            <if test="specialStatement!=null">
+                special_statement =#{specialStatement,jdbcType= VARCHAR },
+            </if>
+            <if test="exemptionInstructions!=null">
+                exemption_instructions =#{exemptionInstructions,jdbcType= VARCHAR },
+            </if>
+            <if test="responsibility!=null">
+                responsibility_ =#{responsibility,jdbcType= VARCHAR },
+            </if>
+            <if test="responsibilityAttach!=null">
+                responsibility_attach =#{responsibilityAttach,jdbcType= VARCHAR },
+            </if>
+            <if test="haveAttach!=null">
+                have_attach =#{haveAttach,jdbcType= NUMERIC },
+            </if>
         </set>
         where id_=#{id}
     </update>
     <select id="get" parameterType="string" resultMap="InsuranceDefinitionMap">
-        select
-        id_,name_,insurance_description,clause_,status_,del_flag,create_by,create_time,
-        update_by,update_time,cut_off_time,notice_,advance_submit_days
-        from base_insurance_definition where id_=#{0}
+        select * from base_insurance_definition where id_=#{0}
     </select>
     <select id="exist" parameterType="string" resultType="int">
         select count(*) from base_insurance_definition where id_=#{0}

picc-common/src/main/resources/mapper/base/InsuranceDefinitionLimit.xml

@@ -16,6 +16,11 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="sortNo" column="sort_no"/>
+        <result property="singleLimit" column="single_limit"/>
+        <result property="terms" column="terms_"/>
+        <result property="deductible" column="deductible_"/>
+        <result property="isAttach" column="is_attach"/>
+
         <association property="definition" column="definition_id"
                      select="com.jpsoft.picc.modules.base.dao.InsuranceDefinitionDAO.get"></association>
     </resultMap>
@@ -33,6 +38,10 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="sortNo" column="sort_no"/>
+        <result property="singleLimit" column="single_limit"/>
+        <result property="terms" column="terms_"/>
+        <result property="deductible" column="deductible_"/>
+        <result property="isAttach" column="is_attach"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit">
         <!--
@@ -42,7 +51,9 @@
         -->
         <![CDATA[
 		insert into base_insurance_definition_limit
-	    (id_,definition_id,name_,limit_,unit_,status_,del_flag,create_by,create_time,update_by,update_time,sort_no)
+	    (id_,definition_id,name_,limit_,unit_,status_,del_flag,create_by,create_time,update_by,update_time,sort_no,
+	    single_limit,terms_,deductible_,is_attach
+	    )
 		values
 		(
             #{id,jdbcType=VARCHAR}
@@ -57,6 +68,10 @@
             ,#{updateBy,jdbcType=VARCHAR}
             ,#{updateTime,jdbcType= TIMESTAMP }
 			,#{sortNo,jdbcType= NUMERIC }
+			,#{singleLimit,jdbcType=VARCHAR}
+			,#{terms,jdbcType=VARCHAR}
+			,#{deductible,jdbcType=VARCHAR}
+			,#{isAttach,jdbcType=NUMERIC}
 		)
 	]]>
     </insert>
@@ -99,6 +114,18 @@
             <if test="sortNo!=null">
                 sort_no=#{sortNo,jdbcType= NUMERIC },
             </if>
+            <if test="singleLimit!=null">
+                single_limit=#{singleLimit,jdbcType=VARCHAR},
+            </if>
+            <if test="terms!=null">
+                terms_=#{terms,jdbcType=VARCHAR},
+            </if>
+            <if test="deductible!=null">
+                deductible_=#{deductible,jdbcType=VARCHAR},
+            </if>
+            <if test="isAttach!=null">
+                is_attach=#{isAttach,jdbcType=VARCHAR},
+            </if>
         </set>
         where id_=#{id}
     </update>