Commit 5386447c by 丁伟峰

entity中的int,统一为Integer,否则当数据库中字段值为null的时候,会失败

1 parent cab5aecc
......@@ -59,7 +59,7 @@ public class EngineerInfoEntity {
/**
* 类型(1全职 2兼职)
*/
private int kind;
private Integer kind;
/**
* 职级,c2,c1...
......@@ -74,7 +74,7 @@ public class EngineerInfoEntity {
/**
* 交通工具,1电动车 2摩托车 3公交车 4自驾
*/
private int vehicle;
private Integer vehicle;
/**
* 摩托车、汽车的车牌号,便于计算限行
......@@ -84,7 +84,7 @@ public class EngineerInfoEntity {
/**
* bean帐号状态(0无效 1有效)
*/
private int beanStatus;
private Integer beanStatus;
/**
* 技术员软标签 { 营销技能 :9, 沟通能力 :7}
......
......@@ -53,7 +53,7 @@ public class MapBlockInfoEntity {
/**
* 类型(1自然行政片区,2自定义片区)
*/
private int kind;
private Integer kind;
/**
* 关联小队id
......@@ -68,7 +68,7 @@ public class MapBlockInfoEntity {
/**
* 状态(0无效 1有效)
*/
private int status;
private Integer status;
/**
* 备注
......
......@@ -30,7 +30,7 @@ public class OrderAppointmentEntity {
/**
* 多人单标识(1主单 2副单)
*/
private int mainSub;
private Integer mainSub;
/**
* 工程师工号
......@@ -55,7 +55,7 @@ public class OrderAppointmentEntity {
/**
* 是否车间单(0否 1是)
*/
private int isWorkshop;
private Integer isWorkshop;
/**
* 客户预约上门时间
......
......@@ -14,9 +14,9 @@ public class OrderTagStrategyEntity {
private Integer id;
private String tagName;
private String processWay;
private int attention;
private int priority;
private int disabled;
private Integer attention;
private Integer priority;
private Integer disabled;
private String memo;
private Date createTime;
private Date updateTime;
......
......@@ -11,7 +11,7 @@ import java.util.Date;
public class OrgBranchEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
private Integer id;
private String branchId;
......@@ -35,7 +35,7 @@ public class OrgBranchEntity {
private String citycodeList;
private int kind;
private Integer kind;
private String layerId;
......
......@@ -12,7 +12,7 @@ public class OrgClusterEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
private Integer id;
private String clusterId;
......@@ -30,7 +30,7 @@ public class OrgClusterEntity {
private String cityName;
private int status;
private Integer status;
private String updateUser;
......
......@@ -15,7 +15,7 @@ public class OrgGroupEntity {
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
private Integer id;
/**
* 小组id
......@@ -60,17 +60,17 @@ public class OrgGroupEntity {
/**
* 类型(1分站,2外围,3小组,4网点,5自保点)
*/
private int kind;
private Integer kind;
/**
* 类型(1自有,2加盟)
*/
private int category;
private Integer category;
/**
* 默认配件仓
*/
private int warehouseId;
private Integer warehouseId;
/**
* 备注
......
......@@ -17,7 +17,7 @@ public class OrgTeamEngineerEntity {
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
private Integer id;
/**
* 工作队id
......@@ -32,7 +32,7 @@ public class OrgTeamEngineerEntity {
/**
* 状态(0无效 1有效)
*/
private int status;
private Integer status;
/**
* 备注
......
......@@ -15,7 +15,7 @@ public class OrgTeamEntity {
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
private Integer id;
/**
* 工作队id
......@@ -30,7 +30,7 @@ public class OrgTeamEntity {
/**
* 类别:1 映射工作队 2自定义工作队
*/
private int teamType;
private Integer teamType;
/**
* 归属大区
......
......@@ -53,12 +53,12 @@ public class ProductCategoryEntity {
/**
* 是否需要低压电工证
*/
private int lowElectricianCert;
private Integer lowElectricianCert;
/**
* 是否需要燃气证
*/
private int gasCert;
private Integer gasCert;
/**
* 图层标签
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!