diff --git a/src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java b/src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java index 4346670..db39462 100644 --- a/src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java +++ b/src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java @@ -91,11 +91,23 @@ public class YgglMainEmp extends Model<YgglMainEmp> { @ApiModelProperty(value="政治面貌 1:中共党员;2:中共预备党员;3共青团员;4:民革党员;5:民盟盟员;6:民建会员;7:民进会员;8:农工党党员;9:致公党党员;10:九三学社社员;11:台盟盟员;12:无党派人士;13:群众",example="101") private Integer zzmm; - @ApiModelProperty(value="籍贯 省/市/区 例:广东/广州/白云",example="101") + @ApiModelProperty(value="籍贯 省",example="101") private String jg; - - @ApiModelProperty(value="户籍城市 省/市/区 例:广东/广州/白云",example="101") - private Integer city; + @ApiModelProperty(value="籍贯 省id",example="101") + private Integer jgId; + + @ApiModelProperty(value = "省") + private String province; + @ApiModelProperty(value = "省id") + private Integer provinceId; + @ApiModelProperty(value = "市") + private String city; + @ApiModelProperty(value = "市") + private Integer cityId; + @ApiModelProperty(value = "区") + private String district; + @ApiModelProperty(value = "区编号") + private Integer districtId; @ApiModelProperty(value="户口性质 1:城镇户口;2:农村户口;3:居民户口",example="101") private Integer hkType; diff --git a/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java b/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java index ddf17b5..367693b 100644 --- a/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java +++ b/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java @@ -112,7 +112,7 @@ public class DzhtController2 { String name = yg.getName(); Integer type = yg.getZjType(); String idType = null; - if (type == null) + if (type == null) return "IDCARD-ERROR"; if (type == 0) { idType = "CRED_PSN_CH_IDCARD";// 大陆身份证 @@ -469,10 +469,10 @@ public class DzhtController2 { } if (quantity == null || remainder == null || remainder <= 0) { - return ResultUtil.error("企业 " + orgCode + " :套餐余额不足,请充值购买后使用"); + return ResultUtil.error("当前企业套餐余额不足,请充值购买后使用"); } if (date != null && date.getTime() <= new Date().getTime()) { - return ResultUtil.error("企业 " + orgCode + " :电子合同套餐已过期"); + return ResultUtil.error("当前企业电子合同套餐已过期"); } // ConfigInfo cfgInfo = new ConfigInfo(null, "1,2", null, null);