机构相关
This commit is contained in:
parent
749dbbd456
commit
7e675a7337
|
|
@ -103,6 +103,8 @@ public class OrgInfoEntity implements Serializable {
|
|||
/**民族*/
|
||||
private String national;
|
||||
/**出生日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日")
|
||||
@DateTimeFormat(pattern="yyyy年MM月dd日")
|
||||
private java.util.Date birthDate;
|
||||
/**住址(身份证上)*/
|
||||
private String idCardAddress;
|
||||
|
|
|
|||
|
|
@ -103,6 +103,8 @@ public class OrgAllInfo implements Serializable {
|
|||
/**民族*/
|
||||
private String national;
|
||||
/**出生日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日")
|
||||
@DateTimeFormat(pattern="yyyy年MM月dd日")
|
||||
private Date birthDate;
|
||||
/**住址(身份证上)*/
|
||||
private String idCardAddress;
|
||||
|
|
|
|||
|
|
@ -87,8 +87,8 @@ public class OrgInfo implements Serializable {
|
|||
* 出生日期
|
||||
*/
|
||||
@Excel(name = "出生日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日")
|
||||
@DateTimeFormat(pattern="yyyy年MM月dd日")
|
||||
@ApiModelProperty(value = "出生日期")
|
||||
private java.util.Date birthDate;
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ public class OrgInfoMQListener {
|
|||
* 2、向机构附加信息表中插入数据
|
||||
* @param dto
|
||||
*/
|
||||
@AutoLog(value = "管理平台提取加盟审核工单")
|
||||
// @AutoLog(value = "管理平台提取加盟审核工单")
|
||||
@RabbitListener(
|
||||
bindings = @QueueBinding(
|
||||
value = @Queue(name = "hldy.orgApply.build"),
|
||||
|
|
@ -77,6 +77,38 @@ public class OrgInfoMQListener {
|
|||
sysDepart.setDelFlag("0");
|
||||
sysDepart.setIzLeaf(1);
|
||||
sysDepart.setPlatType("ywjg");
|
||||
sysDepart.setFranchiseTime(dto.getFranchiseTime());//加盟时间
|
||||
sysDepart.setStatus("0");
|
||||
//基本信息
|
||||
sysDepart.setTel(dto.getTel());//联系电话
|
||||
sysDepart.setWechatName(dto.getWechatName());//微信名称(空字段)
|
||||
sysDepart.setName(dto.getName());//咨询人姓名
|
||||
sysDepart.setSex(dto.getSex());//性别
|
||||
sysDepart.setNational(dto.getNational());//民族
|
||||
sysDepart.setBirthDate(dto.getBirthDate());//出生日期
|
||||
sysDepart.setIdCardAddress(dto.getIdCardAddress());//住址
|
||||
sysDepart.setIdCard(dto.getIdCard());//身份证号
|
||||
sysDepart.setIssuingAuthority(dto.getIssuingAuthority());//签发机关
|
||||
sysDepart.setStartTime(dto.getStartTime());//身份证有效开始日期
|
||||
sysDepart.setEndTime(dto.getEndTime());//身份证有效结束日期
|
||||
sysDepart.setCardZmPath(dto.getCardZmPath());//身份证照片人像面
|
||||
sysDepart.setCardFmPath(dto.getCardFmPath());//身份证照片国徽面
|
||||
sysDepart.setComBusinessLicense(dto.getComBusinessLicense());//营业执照照片
|
||||
sysDepart.setComName(dto.getComName());//企业名称
|
||||
sysDepart.setComRegisterAddress(dto.getComRegisterAddress());//企业注册地址
|
||||
sysDepart.setComCreditCode(dto.getComCreditCode());//企业信用代码
|
||||
sysDepart.setComLegalPerson(dto.getComLegalPerson());//企业法人
|
||||
sysDepart.setOrgAddress(dto.getOrgAddress());//机构地址
|
||||
sysDepart.setOrgCoordinateLo(dto.getOrgCoordinateLo());//机构位置坐标:经度
|
||||
sysDepart.setOrgCoordinateLa(dto.getOrgCoordinateLa());//机构位置坐标:维度
|
||||
sysDepart.setOrgLeader(dto.getOrgLeader());//机构负责人
|
||||
sysDepart.setOrgLeaderPhone(dto.getOrgLeaderPhone());//机构负责人电话
|
||||
sysDepart.setOrgBuildingNumber(dto.getOrgBuildingNumber());//机构楼宇牌号
|
||||
sysDepart.setOrgPropertyType(dto.getOrgPropertyType());//机构房屋性质
|
||||
sysDepart.setOrgBuildingArea(dto.getOrgBuildingArea());//机构建筑面积
|
||||
sysDepart.setOrgProvince(dto.getOrgProvince());//机构省份
|
||||
sysDepart.setOrgCity(dto.getOrgCity());//机构城市
|
||||
sysDepart.setOrgDistrict(dto.getOrgDistrict());//机构区域
|
||||
orgCode = sysBaseAPI.addOrg(sysDepart);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
package com.nu.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
|
@ -43,9 +45,9 @@ public class OrgApplyInfoMQDto implements Serializable {
|
|||
*/
|
||||
private String modifyStatus;
|
||||
/**
|
||||
* 构建状态构建状态1、机构加盟【小程序】2、加盟审核【管理平台】3、加盟合同【管理平台】4、平台搭建【运维平台】5、账户初始化【管理平台】6、信息推送【公众号】
|
||||
* 机构状态构建状态1、机构加盟【小程序】2、加盟审核【管理平台】3、加盟合同【管理平台】4、平台搭建【运维平台】5、账户初始化【管理平台】6、信息推送【公众号】
|
||||
*/
|
||||
private String buildStatus;
|
||||
private String orgStatus;
|
||||
|
||||
//构建状态前后台处理逻辑字段
|
||||
private String buildStatusVal;
|
||||
|
|
@ -86,9 +88,9 @@ public class OrgApplyInfoMQDto implements Serializable {
|
|||
* 民族
|
||||
*/
|
||||
private String national;
|
||||
/**
|
||||
* 出生日期
|
||||
*/
|
||||
/**出生日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日")
|
||||
@DateTimeFormat(pattern="yyyy年MM月dd日")
|
||||
private java.util.Date birthDate;
|
||||
/**
|
||||
* 住址(身份证上)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,15 @@
|
|||
package org.jeecg.common.system.entity;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
|
|
@ -60,6 +66,22 @@ public class SysDepartEntity implements Serializable {
|
|||
* 协议+域名
|
||||
*/
|
||||
private String url;
|
||||
/**
|
||||
* 项目访问路径
|
||||
*/
|
||||
private String contextPath;
|
||||
/**
|
||||
* 是否标准指令库 0是1否
|
||||
*/
|
||||
private String izDirectiveMain;
|
||||
/**
|
||||
* 是否标准标签库 0是1否
|
||||
*/
|
||||
private String izElderTagMain;
|
||||
/**
|
||||
* 媒体资源访问地址
|
||||
*/
|
||||
private String mediaUrl;
|
||||
/**
|
||||
* 省份
|
||||
*/
|
||||
|
|
@ -163,6 +185,107 @@ public class SysDepartEntity implements Serializable {
|
|||
*/
|
||||
private String picUrl;
|
||||
|
||||
/**加盟时间*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date franchiseTime;
|
||||
/**机构状态构建状态1、机构加盟【小程序】2、加盟审核【管理平台】3、加盟合同【管理平台】4、平台搭建【运维平台】5、账户初始化【管理平台】6、信息推送【公众号】*/
|
||||
@Dict(dicCode = "org_build_status")
|
||||
private java.lang.String orgStatus;
|
||||
/**合同提交时间*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date htCommitTime;
|
||||
/**合同提交人*/
|
||||
private java.lang.String htCommitBy;
|
||||
/**合同附件*/
|
||||
private java.lang.String contract;
|
||||
/**合同备注*/
|
||||
private java.lang.String contractNote;
|
||||
|
||||
/**工单状态 0未提交 1待执行 2已回执*/
|
||||
@Dict(dicCode = "work_order_status")
|
||||
private java.lang.String workOrderStatus;
|
||||
/**工单ID*/
|
||||
private java.lang.String workOrderId;
|
||||
/**回复内容*/
|
||||
private java.lang.String replyContent;
|
||||
/**回复附件*/
|
||||
private java.lang.String replyFile;
|
||||
/**回复时间*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date replyTime;
|
||||
/**回复人*/
|
||||
private java.lang.String handleBy;
|
||||
|
||||
/**微信id*/
|
||||
private java.lang.String openId;
|
||||
/**微信名称*/
|
||||
private java.lang.String wechatName;
|
||||
/**联系电话*/
|
||||
private java.lang.String tel;
|
||||
/**咨询人姓名*/
|
||||
private java.lang.String name;
|
||||
/**性别*/
|
||||
private java.lang.String sex;
|
||||
/**民族*/
|
||||
private java.lang.String national;
|
||||
/**出生日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日")
|
||||
@DateTimeFormat(pattern="yyyy年MM月dd日")
|
||||
private Date birthDate;
|
||||
/**住址(身份证上)*/
|
||||
private java.lang.String idCardAddress;
|
||||
/**身份证号*/
|
||||
private java.lang.String idCard;
|
||||
/**签发机关*/
|
||||
private java.lang.String issuingAuthority;
|
||||
/**有效开始日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private java.util.Date startTime;
|
||||
/**有效结束日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private java.util.Date endTime;
|
||||
/**身份证正面*/
|
||||
private java.lang.String cardZmPath;
|
||||
/**身份证反面*/
|
||||
private java.lang.String cardFmPath;
|
||||
/**营业执照照片*/
|
||||
private java.lang.String comBusinessLicense;
|
||||
/**企业名称*/
|
||||
private java.lang.String comName;
|
||||
/**企业注册地址*/
|
||||
private java.lang.String comRegisterAddress;
|
||||
/**企业信用代码*/
|
||||
private java.lang.String comCreditCode;
|
||||
/**企业法人*/
|
||||
private java.lang.String comLegalPerson;
|
||||
/**机构地址*/
|
||||
private java.lang.String orgAddress;
|
||||
/**机构位置坐标:经度*/
|
||||
private String orgCoordinateLo;
|
||||
/**机构位置坐标:纬度*/
|
||||
private String orgCoordinateLa;
|
||||
/**机构负责人*/
|
||||
private java.lang.String orgLeader;
|
||||
/**机构负责人电话*/
|
||||
private java.lang.String orgLeaderPhone;
|
||||
/**机构楼宇牌号*/
|
||||
private java.lang.String orgBuildingNumber;
|
||||
/**机构房屋性质*/
|
||||
private java.lang.String orgPropertyType;
|
||||
/**机构建筑面积*/
|
||||
private java.lang.Double orgBuildingArea;
|
||||
/**机构省份 sys_category.id*/
|
||||
private java.lang.String orgProvince;
|
||||
/**机构城市 sys_category.id*/
|
||||
private java.lang.String orgCity;
|
||||
/**机构区域 sys_category.id*/
|
||||
private java.lang.String orgDistrict;
|
||||
|
||||
//update-begin---author:wangshuai ---date:20200308 for:[JTC-119]在部门管理菜单下设置部门负责人,新增字段负责人ids和旧的负责人ids
|
||||
/**
|
||||
* 部门负责人的ids
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
|
|||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
|
@ -12,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
|
|||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Date;
|
||||
import java.util.Objects;
|
||||
|
||||
|
|
@ -80,6 +82,24 @@ public class SysDepart implements Serializable {
|
|||
*/
|
||||
@Excel(name = "协议+域名", width = 30)
|
||||
private String url;
|
||||
/**
|
||||
* 项目访问路径
|
||||
*/
|
||||
private String contextPath;
|
||||
/**
|
||||
* 是否标准指令库 0是1否
|
||||
*/
|
||||
private String izDirectiveMain;
|
||||
|
||||
/**
|
||||
* 是否标准标签库 0是1否
|
||||
*/
|
||||
private String izElderTagMain;
|
||||
|
||||
/**
|
||||
* 媒体资源访问地址
|
||||
*/
|
||||
private String mediaUrl;
|
||||
/**
|
||||
* 省份
|
||||
*/
|
||||
|
|
@ -202,11 +222,274 @@ public class SysDepart implements Serializable {
|
|||
* 各机构服务器后台接口地址
|
||||
*/
|
||||
private String serverUrl;
|
||||
|
||||
/**
|
||||
* 分享地址前缀
|
||||
*/
|
||||
private String shareUrl;
|
||||
/**
|
||||
* 机构图片
|
||||
*/
|
||||
private String picUrl;
|
||||
|
||||
/**
|
||||
* 加盟时间
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "加盟时间")
|
||||
private java.util.Date franchiseTime;
|
||||
/**
|
||||
* 机构状态构建状态1、机构加盟【小程序】2、加盟审核【管理平台】3、加盟合同【管理平台】4、平台搭建【运维平台】5、账户初始化【管理平台】6、信息推送【公众号】
|
||||
*/
|
||||
@Dict(dicCode = "org_build_status")
|
||||
@Excel(name = "机构状态构建状态1、机构加盟【小程序】2、加盟审核【管理平台】3、加盟合同【管理平台】4、平台搭建【运维平台】5、账户初始化【管理平台】6、信息推送【公众号】", width = 15)
|
||||
@ApiModelProperty(value = "机构状态构建状态1、机构加盟【小程序】2、加盟审核【管理平台】3、加盟合同【管理平台】4、平台搭建【运维平台】5、账户初始化【管理平台】6、信息推送【公众号】")
|
||||
private java.lang.String orgStatus;
|
||||
/**
|
||||
* 合同提交时间
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "合同提交时间")
|
||||
private java.util.Date htCommitTime;
|
||||
/**
|
||||
* 合同提交人
|
||||
*/
|
||||
@Excel(name = "合同提交人", width = 15)
|
||||
@ApiModelProperty(value = "合同提交人")
|
||||
private java.lang.String htCommitBy;
|
||||
/**
|
||||
* 合同附件
|
||||
*/
|
||||
@Excel(name = "合同附件", width = 15)
|
||||
@ApiModelProperty(value = "合同附件")
|
||||
private java.lang.String contract;
|
||||
/**
|
||||
* 合同备注
|
||||
*/
|
||||
@Excel(name = "合同备注", width = 15)
|
||||
@ApiModelProperty(value = "合同备注")
|
||||
private java.lang.String contractNote;
|
||||
|
||||
/**
|
||||
* 工单状态 0未提交 1待执行 2已回执
|
||||
*/
|
||||
@Dict(dicCode = "work_order_status")
|
||||
private java.lang.String workOrderStatus;
|
||||
/**
|
||||
* 工单ID
|
||||
*/
|
||||
private java.lang.String workOrderId;
|
||||
/**
|
||||
* 回复内容
|
||||
*/
|
||||
private java.lang.String replyContent;
|
||||
/**
|
||||
* 回复附件
|
||||
*/
|
||||
private java.lang.String replyFile;
|
||||
/**
|
||||
* 回复时间
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date replyTime;
|
||||
/**
|
||||
* 回复人
|
||||
*/
|
||||
private java.lang.String handleBy;
|
||||
|
||||
/**
|
||||
* 微信id
|
||||
*/
|
||||
@Excel(name = "微信id", width = 15)
|
||||
@ApiModelProperty(value = "微信id")
|
||||
private java.lang.String openId;
|
||||
/**
|
||||
* 微信名称
|
||||
*/
|
||||
@Excel(name = "微信名称", width = 15)
|
||||
@ApiModelProperty(value = "微信名称")
|
||||
private java.lang.String wechatName;
|
||||
/**
|
||||
* 联系电话
|
||||
*/
|
||||
@Excel(name = "联系电话", width = 15)
|
||||
@ApiModelProperty(value = "联系电话")
|
||||
private java.lang.String tel;
|
||||
/**
|
||||
* 咨询人姓名
|
||||
*/
|
||||
@Excel(name = "咨询人姓名", width = 15)
|
||||
@ApiModelProperty(value = "咨询人姓名")
|
||||
private java.lang.String name;
|
||||
/**
|
||||
* 性别
|
||||
*/
|
||||
@Excel(name = "性别", width = 15)
|
||||
@ApiModelProperty(value = "性别")
|
||||
private java.lang.String sex;
|
||||
/**
|
||||
* 民族
|
||||
*/
|
||||
@Excel(name = "民族", width = 15)
|
||||
@ApiModelProperty(value = "民族")
|
||||
private java.lang.String national;
|
||||
/**
|
||||
* 出生日期
|
||||
*/
|
||||
@Excel(name = "出生日期", width = 20, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日")
|
||||
@DateTimeFormat(pattern="yyyy年MM月dd日")
|
||||
@ApiModelProperty(value = "出生日期")
|
||||
private Date birthDate;
|
||||
/**
|
||||
* 住址(身份证上)
|
||||
*/
|
||||
@Excel(name = "住址(身份证上)", width = 15)
|
||||
@ApiModelProperty(value = "住址(身份证上)")
|
||||
private java.lang.String idCardAddress;
|
||||
/**
|
||||
* 身份证号
|
||||
*/
|
||||
@Excel(name = "身份证号", width = 15)
|
||||
@ApiModelProperty(value = "身份证号")
|
||||
private java.lang.String idCard;
|
||||
/**
|
||||
* 签发机关
|
||||
*/
|
||||
@Excel(name = "签发机关", width = 15)
|
||||
@ApiModelProperty(value = "签发机关")
|
||||
private java.lang.String issuingAuthority;
|
||||
/**
|
||||
* 有效开始日期
|
||||
*/
|
||||
@Excel(name = "有效开始日期", width = 20, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "有效开始日期")
|
||||
private java.util.Date startTime;
|
||||
/**
|
||||
* 有效结束日期
|
||||
*/
|
||||
@Excel(name = "有效结束日期", width = 20, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "有效结束日期")
|
||||
private java.util.Date endTime;
|
||||
/**
|
||||
* 身份证正面
|
||||
*/
|
||||
@Excel(name = "身份证正面", width = 15)
|
||||
@ApiModelProperty(value = "身份证正面")
|
||||
private java.lang.String cardZmPath;
|
||||
/**
|
||||
* 身份证反面
|
||||
*/
|
||||
@Excel(name = "身份证反面", width = 15)
|
||||
@ApiModelProperty(value = "身份证反面")
|
||||
private java.lang.String cardFmPath;
|
||||
/**
|
||||
* 营业执照照片
|
||||
*/
|
||||
@Excel(name = "营业执照照片", width = 15)
|
||||
@ApiModelProperty(value = "营业执照照片")
|
||||
private java.lang.String comBusinessLicense;
|
||||
/**
|
||||
* 企业名称
|
||||
*/
|
||||
@Excel(name = "企业名称", width = 15)
|
||||
@ApiModelProperty(value = "企业名称")
|
||||
private java.lang.String comName;
|
||||
/**
|
||||
* 企业注册地址
|
||||
*/
|
||||
@Excel(name = "企业注册地址", width = 15)
|
||||
@ApiModelProperty(value = "企业注册地址")
|
||||
private java.lang.String comRegisterAddress;
|
||||
/**
|
||||
* 企业信用代码
|
||||
*/
|
||||
@Excel(name = "企业信用代码", width = 15)
|
||||
@ApiModelProperty(value = "企业信用代码")
|
||||
private java.lang.String comCreditCode;
|
||||
/**
|
||||
* 企业法人
|
||||
*/
|
||||
@Excel(name = "企业法人", width = 15)
|
||||
@ApiModelProperty(value = "企业法人")
|
||||
private java.lang.String comLegalPerson;
|
||||
/**
|
||||
* 机构地址
|
||||
*/
|
||||
@Excel(name = "机构地址", width = 15)
|
||||
@ApiModelProperty(value = "机构地址")
|
||||
private java.lang.String orgAddress;
|
||||
/**
|
||||
* 机构位置坐标:经度
|
||||
*/
|
||||
@Excel(name = "机构位置坐标:经度", width = 15)
|
||||
@ApiModelProperty(value = "机构位置坐标:经度")
|
||||
private String orgCoordinateLo;
|
||||
/**
|
||||
* 机构位置坐标:纬度
|
||||
*/
|
||||
@Excel(name = "机构位置坐标:纬度", width = 15)
|
||||
@ApiModelProperty(value = "机构位置坐标:纬度")
|
||||
private String orgCoordinateLa;
|
||||
/**
|
||||
* 机构负责人
|
||||
*/
|
||||
@Excel(name = "机构负责人", width = 15)
|
||||
@ApiModelProperty(value = "机构负责人")
|
||||
private java.lang.String orgLeader;
|
||||
/**
|
||||
* 机构负责人电话
|
||||
*/
|
||||
@Excel(name = "机构负责人电话", width = 15)
|
||||
@ApiModelProperty(value = "机构负责人电话")
|
||||
private java.lang.String orgLeaderPhone;
|
||||
/**
|
||||
* 机构楼宇牌号
|
||||
*/
|
||||
@Excel(name = "机构楼宇牌号", width = 15)
|
||||
@ApiModelProperty(value = "机构楼宇牌号")
|
||||
private java.lang.String orgBuildingNumber;
|
||||
/**
|
||||
* 机构房屋性质
|
||||
*/
|
||||
@Excel(name = "机构房屋性质", width = 15)
|
||||
@ApiModelProperty(value = "机构房屋性质")
|
||||
private java.lang.String orgPropertyType;
|
||||
/**
|
||||
* 机构建筑面积
|
||||
*/
|
||||
@Excel(name = "机构建筑面积", width = 15)
|
||||
@ApiModelProperty(value = "机构建筑面积")
|
||||
private java.lang.Double orgBuildingArea;
|
||||
/**
|
||||
* 机构省份 sys_category.id
|
||||
*/
|
||||
@Excel(name = "机构省份", width = 15)
|
||||
@ApiModelProperty(value = "机构省份")
|
||||
@Dict(dictTable = "sys_category", dicCode = "id", dicText = "name")
|
||||
private java.lang.String orgProvince;
|
||||
/**
|
||||
* 机构城市 sys_category.id
|
||||
*/
|
||||
@Excel(name = "机构城市", width = 15)
|
||||
@ApiModelProperty(value = "机构城市")
|
||||
@Dict(dictTable = "sys_category", dicCode = "id", dicText = "name")
|
||||
private java.lang.String orgCity;
|
||||
/**
|
||||
* 机构区域 sys_category.id
|
||||
*/
|
||||
@Excel(name = "机构区域", width = 15)
|
||||
@ApiModelProperty(value = "机构区域")
|
||||
@Dict(dictTable = "sys_category", dicCode = "id", dicText = "name")
|
||||
private java.lang.String orgDistrict;
|
||||
|
||||
//update-begin---author:wangshuai ---date:20200308 for:[JTC-119]在部门管理菜单下设置部门负责人,新增字段负责人ids和旧的负责人ids
|
||||
/**
|
||||
* 部门负责人的ids
|
||||
|
|
@ -220,62 +503,17 @@ public class SysDepart implements Serializable {
|
|||
private String oldDirectorUserIds;
|
||||
//update-end---author:wangshuai ---date:20200308 for:[JTC-119]新增字段负责人ids和旧的负责人ids
|
||||
|
||||
/**
|
||||
* 重写equals方法
|
||||
*/
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
if (!super.equals(o)) {
|
||||
return false;
|
||||
}
|
||||
SysDepart depart = (SysDepart) o;
|
||||
return Objects.equals(id, depart.id) &&
|
||||
Objects.equals(parentId, depart.parentId) &&
|
||||
Objects.equals(departName, depart.departName) &&
|
||||
Objects.equals(departNameEn, depart.departNameEn) &&
|
||||
Objects.equals(departNameAbbr, depart.departNameAbbr) &&
|
||||
Objects.equals(departOrder, depart.departOrder) &&
|
||||
Objects.equals(description, depart.description) &&
|
||||
Objects.equals(orgCategory, depart.orgCategory) &&
|
||||
Objects.equals(orgType, depart.orgType) &&
|
||||
Objects.equals(orgCode, depart.orgCode) &&
|
||||
Objects.equals(url, depart.url) &&
|
||||
Objects.equals(province, depart.province) &&
|
||||
Objects.equals(city, depart.city) &&
|
||||
Objects.equals(district, depart.district) &&
|
||||
Objects.equals(operationStartTime, depart.operationStartTime) &&
|
||||
Objects.equals(operationEndTime, depart.operationEndTime) &&
|
||||
Objects.equals(contractStartTime, depart.contractStartTime) &&
|
||||
Objects.equals(contractEndTime, depart.contractEndTime) &&
|
||||
Objects.equals(mobile, depart.mobile) &&
|
||||
Objects.equals(fax, depart.fax) &&
|
||||
Objects.equals(address, depart.address) &&
|
||||
Objects.equals(memo, depart.memo) &&
|
||||
Objects.equals(status, depart.status) &&
|
||||
Objects.equals(delFlag, depart.delFlag) &&
|
||||
Objects.equals(createBy, depart.createBy) &&
|
||||
Objects.equals(createTime, depart.createTime) &&
|
||||
Objects.equals(updateBy, depart.updateBy) &&
|
||||
Objects.equals(tenantId, depart.tenantId) &&
|
||||
Objects.equals(payableAmount, depart.payableAmount) &&
|
||||
Objects.equals(updateTime, depart.updateTime);
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
SysDepart sysDepart = (SysDepart) o;
|
||||
return Objects.equals(id, sysDepart.id) && Objects.equals(parentId, sysDepart.parentId) && Objects.equals(departName, sysDepart.departName) && Objects.equals(departNameEn, sysDepart.departNameEn) && Objects.equals(departNameAbbr, sysDepart.departNameAbbr) && Objects.equals(departOrder, sysDepart.departOrder) && Objects.equals(description, sysDepart.description) && Objects.equals(orgCategory, sysDepart.orgCategory) && Objects.equals(orgType, sysDepart.orgType) && Objects.equals(orgCode, sysDepart.orgCode) && Objects.equals(url, sysDepart.url) && Objects.equals(contextPath, sysDepart.contextPath) && Objects.equals(izDirectiveMain, sysDepart.izDirectiveMain) && Objects.equals(izElderTagMain, sysDepart.izElderTagMain) && Objects.equals(mediaUrl, sysDepart.mediaUrl) && Objects.equals(province, sysDepart.province) && Objects.equals(city, sysDepart.city) && Objects.equals(district, sysDepart.district) && Objects.equals(platType, sysDepart.platType) && Objects.equals(operationStartTime, sysDepart.operationStartTime) && Objects.equals(operationEndTime, sysDepart.operationEndTime) && Objects.equals(contractStartTime, sysDepart.contractStartTime) && Objects.equals(contractEndTime, sysDepart.contractEndTime) && Objects.equals(mobile, sysDepart.mobile) && Objects.equals(fax, sysDepart.fax) && Objects.equals(address, sysDepart.address) && Objects.equals(memo, sysDepart.memo) && Objects.equals(payableAmount, sysDepart.payableAmount) && Objects.equals(status, sysDepart.status) && Objects.equals(delFlag, sysDepart.delFlag) && Objects.equals(qywxIdentifier, sysDepart.qywxIdentifier) && Objects.equals(dingIdentifier, sysDepart.dingIdentifier) && Objects.equals(createBy, sysDepart.createBy) && Objects.equals(createTime, sysDepart.createTime) && Objects.equals(updateBy, sysDepart.updateBy) && Objects.equals(updateTime, sysDepart.updateTime) && Objects.equals(tenantId, sysDepart.tenantId) && Objects.equals(izLeaf, sysDepart.izLeaf) && Objects.equals(serverUrl, sysDepart.serverUrl) && Objects.equals(shareUrl, sysDepart.shareUrl) && Objects.equals(picUrl, sysDepart.picUrl) && Objects.equals(franchiseTime, sysDepart.franchiseTime) && Objects.equals(orgStatus, sysDepart.orgStatus) && Objects.equals(htCommitTime, sysDepart.htCommitTime) && Objects.equals(htCommitBy, sysDepart.htCommitBy) && Objects.equals(contract, sysDepart.contract) && Objects.equals(contractNote, sysDepart.contractNote) && Objects.equals(workOrderStatus, sysDepart.workOrderStatus) && Objects.equals(workOrderId, sysDepart.workOrderId) && Objects.equals(replyContent, sysDepart.replyContent) && Objects.equals(replyFile, sysDepart.replyFile) && Objects.equals(replyTime, sysDepart.replyTime) && Objects.equals(handleBy, sysDepart.handleBy) && Objects.equals(openId, sysDepart.openId) && Objects.equals(wechatName, sysDepart.wechatName) && Objects.equals(tel, sysDepart.tel) && Objects.equals(name, sysDepart.name) && Objects.equals(sex, sysDepart.sex) && Objects.equals(national, sysDepart.national) && Objects.equals(birthDate, sysDepart.birthDate) && Objects.equals(idCardAddress, sysDepart.idCardAddress) && Objects.equals(idCard, sysDepart.idCard) && Objects.equals(issuingAuthority, sysDepart.issuingAuthority) && Objects.equals(startTime, sysDepart.startTime) && Objects.equals(endTime, sysDepart.endTime) && Objects.equals(cardZmPath, sysDepart.cardZmPath) && Objects.equals(cardFmPath, sysDepart.cardFmPath) && Objects.equals(comBusinessLicense, sysDepart.comBusinessLicense) && Objects.equals(comName, sysDepart.comName) && Objects.equals(comRegisterAddress, sysDepart.comRegisterAddress) && Objects.equals(comCreditCode, sysDepart.comCreditCode) && Objects.equals(comLegalPerson, sysDepart.comLegalPerson) && Objects.equals(orgAddress, sysDepart.orgAddress) && Objects.equals(orgCoordinateLo, sysDepart.orgCoordinateLo) && Objects.equals(orgCoordinateLa, sysDepart.orgCoordinateLa) && Objects.equals(orgLeader, sysDepart.orgLeader) && Objects.equals(orgLeaderPhone, sysDepart.orgLeaderPhone) && Objects.equals(orgBuildingNumber, sysDepart.orgBuildingNumber) && Objects.equals(orgPropertyType, sysDepart.orgPropertyType) && Objects.equals(orgBuildingArea, sysDepart.orgBuildingArea) && Objects.equals(orgProvince, sysDepart.orgProvince) && Objects.equals(orgCity, sysDepart.orgCity) && Objects.equals(orgDistrict, sysDepart.orgDistrict);
|
||||
}
|
||||
|
||||
/**
|
||||
* 重写hashCode方法
|
||||
*/
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(super.hashCode(), id, parentId, departName,
|
||||
departNameEn, departNameAbbr, departOrder, description, orgCategory,
|
||||
orgType, orgCode, url, province, city, district, operationStartTime,
|
||||
operationEndTime, contractStartTime, contractEndTime, mobile, fax, address, memo, status,
|
||||
delFlag, createBy, createTime, updateBy, updateTime, tenantId, payableAmount);
|
||||
return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr, departOrder, description, orgCategory, orgType, orgCode, url, contextPath, izDirectiveMain, izElderTagMain, mediaUrl, province, city, district, platType, operationStartTime, operationEndTime, contractStartTime, contractEndTime, mobile, fax, address, memo, payableAmount, status, delFlag, qywxIdentifier, dingIdentifier, createBy, createTime, updateBy, updateTime, tenantId, izLeaf, serverUrl, shareUrl, picUrl, franchiseTime, orgStatus, htCommitTime, htCommitBy, contract, contractNote, workOrderStatus, workOrderId, replyContent, replyFile, replyTime, handleBy, openId, wechatName, tel, name, sex, national, birthDate, idCardAddress, idCard, issuingAuthority, startTime, endTime, cardZmPath, cardFmPath, comBusinessLicense, comName, comRegisterAddress, comCreditCode, comLegalPerson, orgAddress, orgCoordinateLo, orgCoordinateLa, orgLeader, orgLeaderPhone, orgBuildingNumber, orgPropertyType, orgBuildingArea, orgProvince, orgCity, orgDistrict);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue