Skip to content

Y
yifu-mvp
Commit ef3f2dd4 authored by 李灿灿's avatar 李灿灿
Browse files
Options

Merge branch 'feature-licancan' into 'develop' 

商险明细实体类

See merge request fangxinjiang/yifu!4
parents c66c8e05 ad8dcec9
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 22 deletions
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java 0 → 100644
View file @ ef3f2dd4
package com.yifu.cloud.plus.v1.yifu.insurances.constants;
/**
* @author licancan
* @description 商险常量
* @date 2022-07-18 17:52:59
*/
public class InsurancesConstants {
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @ ef3f2dd4
......@@ -12,7 +12,8 @@ import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
......@@ -51,8 +52,13 @@ public class TInsuranceDetail extends BaseEntity {
private String empIdcardNo;
/**
* 项目编码
* 订单编号
*/
private String orderNo;
/**
* 项目编码
*/
private String deptNo;
/**
......@@ -78,22 +84,22 @@ public class TInsuranceDetail extends BaseEntity {
/**
* 保单开始时间
*/
private Date policyStart;
private LocalDate policyStart;
/**
* 保单结束时间
*/
private Date policyEnd;
private LocalDate policyEnd;
/**
* 保单生效日期
*/
private Date policyEffect;
private LocalDate policyEffect;
/**
* 办理时间
*/
private Date batchDate;
private LocalDateTime batchDate;
/**
* 结算月
......@@ -111,24 +117,24 @@ public class TInsuranceDetail extends BaseEntity {
private Integer buyType;
/**
* 商险购买地省名称
* 商险购买地省code
*/
private String businessInsuranceProvName;
private Integer insuranceProvince;
/**
* 商险购买地市名称
* 商险购买地市code
*/
private String businessInsuranceCityName;
private Integer insuranceCity;
/**
* 商险办理省名称
* 商险办理省code
*/
private String businessInsuranceHandleProvName;
private Integer insuranceHandleProvince;
/**
* 商险办理城市名称
* 商险办理城市code
*/
private String businessInsuranceHandleCityName;
private Integer insuranceHandleCity;
/**
* 结算类型 (1、单独结算 2、合并结算-和工资一起结算)
......@@ -181,6 +187,11 @@ public class TInsuranceDetail extends BaseEntity {
@Schema(description = "是否过期 0未过期 1已过期")
private Integer isOverdue;
/**
* 备注
*/
private String remark;
/**
* 是否删除 0未删除/1删除
*/
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java 0 → 100644
View file @ ef3f2dd4
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDate;
/**
* @author licancan
* @description 商险办理新增入参
* @date 2022-07-18 17:03:31
*/
@Data
public class InsuranceAddParam implements Serializable {
private static final long serialVersionUID = -2689686777914935788L;
/**
* 订单编号
*/
@NotBlank(message = "订单编号不能为空")
@Length(max = 32, message = "订单编号不能超过32个字符")
@Schema(description = "订单编号")
private String orderNo;
/**
* 员工姓名
*/
@NotBlank(message = "员工姓名不能为空")
@Length(max = 32, message = "员工姓名不能超过32个字符")
@Schema(description = "员工姓名")
private String empName;
/**
* 员工身份证号
*/
@NotBlank(message = "员工身份证号不能为空")
@Length(max = 32, message = "员工身份证号不能超过32个字符")
@Schema(description = "员工身份证号")
private String empIdcardNo;
/**
* 项目编码
*/
@NotBlank(message = "项目编码不能为空")
@Length(max = 32, message = "项目编码不能超过32个字符")
@Schema(description = "项目编码")
private String deptNo;
/**
* 保险公司名称
*/
@NotBlank(message = "保险公司名称不能为空")
@Length(max = 32, message = "保险公司名称不能超过32个字符")
@Schema(description = "保险公司名称")
private String insuranceCompanyName;
/**
* 险种名称
*/
@NotBlank(message = "险种名称不能为空")
@Length(max = 32, message = "险种名称不能超过32个字符")
@Schema(description = "险种名称")
private String insuranceTypeName;
/**
* 保单开始时间
*/
private LocalDate policyStart;
/**
* 保单结束时间
*/
private LocalDate policyEnd;
/**
* 商险购买地省名称
*/
private String insuranceProvinceName;
/**
* 商险购买地市名称
*/
private String insuranceCityName;
/**
* 商险办理省名称
*/
private String insuranceHandleProvinceName;
/**
* 商险办理城市名称
*/
private String insuranceHandleCityName;
/**
* 结算月
*/
private String settleMonth;
/**
* 岗位
*/
private String post;
/**
* 备注
*/
private String remark;
}
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
View file @ ef3f2dd4
......@@ -9,6 +9,7 @@
<result property="empId" column="EMP_ID" jdbcType="VARCHAR"/>
<result property="empName" column="EMP_NAME" jdbcType="VARCHAR"/>
<result property="empIdcardNo" column="EMP_IDCARD_NO" jdbcType="VARCHAR"/>
<result property="orderNo" column="ORDER_NO" jdbcType="VARCHAR"/>
<result property="deptNo" column="DEPT_NO" jdbcType="VARCHAR"/>
<result property="insuranceCompanyName" column="INSURANCE_COMPANY_NAME" jdbcType="VARCHAR"/>
<result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="VARCHAR"/>
......@@ -21,10 +22,10 @@
<result property="settleMonth" column="SETTLE_MONTH" jdbcType="VARCHAR"/>
<result property="invoiceNo" column="INVOICE_NO" jdbcType="VARCHAR"/>
<result property="buyType" column="BUY_TYPE" jdbcType="TINYINT"/>
<result property="businessInsuranceProvName" column="BUSINESS_INSURANCE_PROV_NAME" jdbcType="VARCHAR"/>
<result property="businessInsuranceCityName" column="BUSINESS_INSURANCE_CITY_NAME" jdbcType="VARCHAR"/>
<result property="businessInsuranceHandleProvName" column="BUSINESS_INSURANCE_HANDLE_PROV_NAME" jdbcType="VARCHAR"/>
<result property="businessInsuranceHandleCityName" column="BUSINESS_INSURANCE_HANDLE_CITY_NAME" jdbcType="VARCHAR"/>
<result property="insuranceProvince" column="INSURANCE_PROVINCE" jdbcType="TINYINT"/>
<result property="insuranceCity" column="INSURANCE_CITY" jdbcType="TINYINT"/>
<result property="insuranceHandleProvince" column="INSURANCE_HANDLE_PROVINCE" jdbcType="TINYINT"/>
<result property="insuranceHandleCity" column="INSURANCE_HANDLE_CITY" jdbcType="TINYINT"/>
<result property="settleType" column="SETTLE_TYPE" jdbcType="VARCHAR"/>
<result property="actualPremium" column="ACTUAL_PREMIUM" jdbcType="DECIMAL"/>
<result property="estimatePremium" column="ESTIMATE_PREMIUM" jdbcType="DECIMAL"/>
......@@ -35,6 +36,7 @@
<result property="isUse" column="IS_USE" jdbcType="TINYINT"/>
<result property="isEffect" column="IS_EFFECT" jdbcType="TINYINT"/>
<result property="isOverdue" column="IS_OVERDUE" jdbcType="TINYINT"/>
<result property="remark" column="REMARK" jdbcType="VARCHAR"/>
<result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
<result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
<result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
......@@ -45,15 +47,15 @@
<sql id="Base_Column_List">
ID,EMP_ID,EMP_NAME,
EMP_IDCARD_NO,DEPT_NO,INSURANCE_COMPANY_NAME,
EMP_IDCARD_NO,ORDER_NO,DEPT_NO,INSURANCE_COMPANY_NAME,
INSURANCE_TYPE_ID,BUY_STANDARD,POLICY_NO,
POLICY_START,POLICY_END,POLICY_EFFECT,
BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
BUY_TYPE,BUSINESS_INSURANCE_PROV_NAME,BUSINESS_INSURANCE_CITY_NAME,
BUSINESS_INSURANCE_HANDLE_PROV_NAME,BUSINESS_INSURANCE_HANDLE_CITY_NAME,SETTLE_TYPE,
BUY_TYPE,INSURANCE_PROVINCE,INSURANCE_CITY,
INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_CITY,SETTLE_TYPE,
ACTUAL_PREMIUM,ESTIMATE_PREMIUM,SETTLE_BALANCE,
BUY_HANDLE_STATUS,SETTLE_HANDLE_STATUS,REDUCE_HANDLE_STATUS,
IS_USE,IS_EFFECT,IS_OVERDUE,
IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
CREATE_BY,CREATE_NAME,CREATE_TIME,
UPDATE_BY,UPDATE_TIME,DELETE_FLAG
</sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment