增加生效年月字段。

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicy.java

@@ -1,330 +1,328 @@
 package com.jpsoft.picc.modules.business.entity;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
+import io.swagger.annotations.ApiModel;
 
 /**
- * 描述:business_insurance_policy的实体类
+ 描述:business_insurance_policy的实体类
  */
 @ApiModel(value = "business_insurance_policy的实体类")
 public class InsurancePolicy {
+    @ApiModelProperty(value = "编号")
     private String id;
+    @ApiModelProperty(value = "状态:待制单50/待出单60/已出单70")
     private String status;
+    @ApiModelProperty(value = "流程审核状态:正常/回退等")
     private String processStatus;
+    @ApiModelProperty(value = "保险费合计(总金额)")
     private BigDecimal insuranceFee;
+    @ApiModelProperty(value = "开始时间")
     private Date startTime;
+    @ApiModelProperty(value = "结束时间")
     private Date endTime;
+    @ApiModelProperty(value = "人数")
     private Integer number;
+    @ApiModelProperty(value = "入账银行")
     private String accountBank;
+    @ApiModelProperty(value = "出账银行")
     private String issuingBank;
+    @ApiModelProperty(value = "单号")
     private String singlNumber;
+    @ApiModelProperty(value = "转账时间")
     private Date transferTime;
+    @ApiModelProperty(value = "保险代理人")
     private String agentId;
+    @ApiModelProperty(value = "投保单附件")
     private String insurancePolicyFile;
+    @ApiModelProperty(value = "当前第几份")
     private Integer no;
+    @ApiModelProperty(value = "生效年月(yyyyMM)")
+    private String effectiveDate;
+    @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
     private String createBy;
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
+    @ApiModelProperty(value = "修改人")
     private String updateBy;
+    @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     /**
-     * 获取编号
+     *获取编号
      */
-    @ApiModelProperty(value = "编号")
-    public String getId() {
+    public String getId(){
         return id;
     }
 
     /**
-     * 设置编号
+     *设置编号
      */
-    public void setId(String id) {
+    public void setId(String id){
         this.id = id;
     }
-
     /**
-     * 获取状态:待制单50/待出单60/已出单70
+     *获取状态:待制单50/待出单60/已出单70
      */
-    @ApiModelProperty(value = "状态:待制单50/待出单60/已出单70")
-    public String getStatus() {
+    public String getStatus(){
         return status;
     }
 
     /**
-     * 设置状态:待制单50/待出单60/已出单70
+     *设置状态:待制单50/待出单60/已出单70
      */
-    public void setStatus(String status) {
+    public void setStatus(String status){
         this.status = status;
     }
-
     /**
-     * 获取流程审核状态:正常/回退等
+     *获取流程审核状态:正常/回退等
      */
-    @ApiModelProperty(value = "流程审核状态:正常/回退等")
-    public String getProcessStatus() {
+    public String getProcessStatus(){
         return processStatus;
     }
 
     /**
-     * 设置流程审核状态:正常/回退等
+     *设置流程审核状态:正常/回退等
      */
-    public void setProcessStatus(String processStatus) {
+    public void setProcessStatus(String processStatus){
         this.processStatus = processStatus;
     }
-
     /**
-     * 获取保险费合计(总金额)
+     *获取保险费合计(总金额)
      */
-    @ApiModelProperty(value = "保险费合计(总金额)")
-    public BigDecimal getInsuranceFee() {
+    public BigDecimal getInsuranceFee(){
         return insuranceFee;
     }
 
     /**
-     * 设置保险费合计(总金额)
+     *设置保险费合计(总金额)
      */
-    public void setInsuranceFee(BigDecimal insuranceFee) {
+    public void setInsuranceFee(BigDecimal insuranceFee){
         this.insuranceFee = insuranceFee;
     }
-
     /**
-     * 获取开始时间
+     *获取开始时间
      */
-    @ApiModelProperty(value = "开始时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    public Date getStartTime() {
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    public Date getStartTime(){
         return startTime;
     }
 
     /**
-     * 设置开始时间
+     *设置开始时间
      */
-    public void setStartTime(Date startTime) {
+    public void setStartTime(Date startTime){
         this.startTime = startTime;
     }
-
     /**
-     * 获取结束时间
+     *获取结束时间
      */
-    @ApiModelProperty(value = "结束时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    public Date getEndTime() {
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    public Date getEndTime(){
         return endTime;
     }
 
     /**
-     * 设置结束时间
+     *设置结束时间
      */
-    public void setEndTime(Date endTime) {
+    public void setEndTime(Date endTime){
         this.endTime = endTime;
     }
-
     /**
-     * 获取人数
+     *获取人数
      */
-    @ApiModelProperty(value = "人数")
-    public Integer getNumber() {
+    public Integer getNumber(){
         return number;
     }
 
     /**
-     * 设置人数
+     *设置人数
      */
-    public void setNumber(Integer number) {
+    public void setNumber(Integer number){
         this.number = number;
     }
-
     /**
-     * 获取入账银行
+     *获取入账银行
      */
-    @ApiModelProperty(value = "入账银行")
-    public String getAccountBank() {
+    public String getAccountBank(){
         return accountBank;
     }
 
     /**
-     * 设置入账银行
+     *设置入账银行
      */
-    public void setAccountBank(String accountBank) {
+    public void setAccountBank(String accountBank){
         this.accountBank = accountBank;
     }
-
     /**
-     * 获取出账银行
+     *获取出账银行
      */
-    @ApiModelProperty(value = "出账银行")
-    public String getIssuingBank() {
+    public String getIssuingBank(){
         return issuingBank;
     }
 
     /**
-     * 设置出账银行
+     *设置出账银行
      */
-    public void setIssuingBank(String issuingBank) {
+    public void setIssuingBank(String issuingBank){
         this.issuingBank = issuingBank;
     }
-
     /**
-     * 获取单号
+     *获取单号
      */
-    @ApiModelProperty(value = "单号")
-    public String getSinglNumber() {
+    public String getSinglNumber(){
         return singlNumber;
     }
 
     /**
-     * 设置单号
+     *设置单号
      */
-    public void setSinglNumber(String singlNumber) {
+    public void setSinglNumber(String singlNumber){
         this.singlNumber = singlNumber;
     }
-
     /**
-     * 获取转账时间
+     *获取转账时间
      */
-    @ApiModelProperty(value = "转账时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    public Date getTransferTime() {
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    public Date getTransferTime(){
         return transferTime;
     }
 
     /**
-     * 设置转账时间
+     *设置转账时间
      */
-    public void setTransferTime(Date transferTime) {
+    public void setTransferTime(Date transferTime){
         this.transferTime = transferTime;
     }
-
     /**
-     * 获取保险代理人
+     *获取保险代理人
      */
-    @ApiModelProperty(value = "保险代理人")
-    public String getAgentId() {
+    public String getAgentId(){
         return agentId;
     }
 
     /**
-     * 设置保险代理人
+     *设置保险代理人
      */
-    public void setAgentId(String agentId) {
+    public void setAgentId(String agentId){
         this.agentId = agentId;
     }
-
     /**
-     * 获取投保单附件
+     *获取投保单附件
      */
-    @ApiModelProperty(value = "投保单附件")
-    public String getInsurancePolicyFile() {
+    public String getInsurancePolicyFile(){
         return insurancePolicyFile;
     }
 
     /**
-     * 设置投保单附件
+     *设置投保单附件
      */
-    public void setInsurancePolicyFile(String insurancePolicyFile) {
+    public void setInsurancePolicyFile(String insurancePolicyFile){
         this.insurancePolicyFile = insurancePolicyFile;
     }
-
     /**
-     * 获取当前第几份
+     *获取当前第几份
      */
-    @ApiModelProperty(value = "当前第几份")
-    public Integer getNo() {
+    public Integer getNo(){
         return no;
     }
 
     /**
-     * 设置当前第几份
+     *设置当前第几份
      */
-    public void setNo(Integer no) {
+    public void setNo(Integer no){
         this.no = no;
     }
+    /**
+     *获取生效年月(yyyyMM)
+     */
+    public String getEffectiveDate(){
+        return effectiveDate;
+    }
 
     /**
-     * 获取是否删除
+     *设置生效年月(yyyyMM)
      */
-    @ApiModelProperty(value = "是否删除")
-    public Boolean getDelFlag() {
+    public void setEffectiveDate(String effectiveDate){
+        this.effectiveDate = effectiveDate;
+    }
+    /**
+     *获取是否删除
+     */
+    public Boolean getDelFlag(){
         return delFlag;
     }
 
     /**
-     * 设置是否删除
+     *设置是否删除
      */
-    public void setDelFlag(Boolean delFlag) {
+    public void setDelFlag(Boolean delFlag){
         this.delFlag = delFlag;
     }
-
     /**
-     * 获取创建人
+     *获取创建人
      */
-    @ApiModelProperty(value = "创建人")
-    public String getCreateBy() {
+    public String getCreateBy(){
         return createBy;
     }
 
     /**
-     * 设置创建人
+     *设置创建人
      */
-    public void setCreateBy(String createBy) {
+    public void setCreateBy(String createBy){
         this.createBy = createBy;
     }
-
     /**
-     * 获取创建时间
+     *获取创建时间
      */
-    @ApiModelProperty(value = "创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    public Date getCreateTime() {
+    @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) {
+    public void setCreateTime(Date createTime){
         this.createTime = createTime;
     }
-
     /**
-     * 获取修改人
+     *获取修改人
      */
-    @ApiModelProperty(value = "修改人")
-    public String getUpdateBy() {
+    public String getUpdateBy(){
         return updateBy;
     }
 
     /**
-     * 设置修改人
+     *设置修改人
      */
-    public void setUpdateBy(String updateBy) {
+    public void setUpdateBy(String updateBy){
         this.updateBy = updateBy;
     }
-
     /**
-     * 获取修改时间
+     *获取修改时间
      */
-    @ApiModelProperty(value = "修改时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    public Date getUpdateTime() {
+    @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) {
+    public void setUpdateTime(Date updateTime){
         this.updateTime = updateTime;
     }
 }

picc-common/src/main/resources/mapper/business/InsurancePolicy.xml

@@ -18,6 +18,7 @@
         <result property="agentId" column="agent_id" />
         <result property="insurancePolicyFile" column="insurance_policy_file" />
         <result property="no" column="no_" />
+        <result property="effectiveDate" column="effective_date" />
         <result property="delFlag" column="del_flag" />
         <result property="createBy" column="create_by" />
         <result property="createTime" column="create_time" />
@@ -32,28 +33,29 @@
         -->
         <![CDATA[
 		insert into business_insurance_policy
-	    (id_,status_,process_status,insurance_fee,start_time,end_time,number_,account_bank,issuing_bank,singl_number,transfer_time,agent_id,insurance_policy_file,no_,del_flag,create_by,create_time,update_by,update_time)
+	    (id_,status_,process_status,insurance_fee,start_time,end_time,number_,account_bank,issuing_bank,singl_number,transfer_time,agent_id,insurance_policy_file,no_,effective_date,del_flag,create_by,create_time,update_by,update_time)
 		values
 		(
-#{id,jdbcType=VARCHAR}
-,#{status,jdbcType=VARCHAR}
-,#{processStatus,jdbcType=VARCHAR}
-,#{insuranceFee,jdbcType= NUMERIC }
-,#{startTime,jdbcType= TIMESTAMP }
-,#{endTime,jdbcType= TIMESTAMP }
-,#{number,jdbcType= NUMERIC }
-,#{accountBank,jdbcType=VARCHAR}
-,#{issuingBank,jdbcType=VARCHAR}
-,#{singlNumber,jdbcType=VARCHAR}
-,#{transferTime,jdbcType= TIMESTAMP }
-,#{agentId,jdbcType=VARCHAR}
-,#{insurancePolicyFile,jdbcType=VARCHAR}
-,#{no,jdbcType= NUMERIC }
-,#{delFlag,jdbcType= NUMERIC }
-,#{createBy,jdbcType=VARCHAR}
-,#{createTime,jdbcType= TIMESTAMP }
-,#{updateBy,jdbcType=VARCHAR}
-,#{updateTime,jdbcType= TIMESTAMP }
+            #{id,jdbcType=VARCHAR}
+            ,#{status,jdbcType=VARCHAR}
+            ,#{processStatus,jdbcType=VARCHAR}
+            ,#{insuranceFee,jdbcType= NUMERIC }
+            ,#{startTime,jdbcType= TIMESTAMP }
+            ,#{endTime,jdbcType= TIMESTAMP }
+            ,#{number,jdbcType= NUMERIC }
+            ,#{accountBank,jdbcType=VARCHAR}
+            ,#{issuingBank,jdbcType=VARCHAR}
+            ,#{singlNumber,jdbcType=VARCHAR}
+            ,#{transferTime,jdbcType= TIMESTAMP }
+            ,#{agentId,jdbcType=VARCHAR}
+            ,#{insurancePolicyFile,jdbcType=VARCHAR}
+            ,#{no,jdbcType= NUMERIC }
+            ,#{effectiveDate,jdbcType=VARCHAR}
+            ,#{delFlag,jdbcType= NUMERIC }
+            ,#{createBy,jdbcType=VARCHAR}
+            ,#{createTime,jdbcType= TIMESTAMP }
+            ,#{updateBy,jdbcType=VARCHAR}
+            ,#{updateTime,jdbcType= TIMESTAMP }
 		)
 	]]>
     </insert>
@@ -102,6 +104,9 @@
             <if test="no!=null">
                 no_=#{no,jdbcType= NUMERIC },
             </if>
+            <if test="effectiveDate!=null">
+                effective_date=#{effectiveDate,jdbcType=VARCHAR},
+            </if>
             <if test="delFlag!=null">
                 del_flag=#{delFlag,jdbcType= NUMERIC },
             </if>
@@ -121,8 +126,7 @@
         where id_=#{id}
     </update>
     <select id="get" parameterType="string" resultMap="InsurancePolicyMap">
-        select
-        id_,status_,process_status,insurance_fee,start_time,end_time,number_,account_bank,issuing_bank,singl_number,transfer_time,agent_id,insurance_policy_file,no_,del_flag,create_by,create_time,update_by,update_time		from business_insurance_policy where id_=#{0}
+        select * from business_insurance_policy where id_=#{0}
     </select>
     <select id="exist" parameterType="string" resultType="int">
         select count(*) from business_insurance_policy where id_=#{0} and del_flag = false