diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgAllInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgAllInfo.java index dad7e42..c643af1 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgAllInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgAllInfo.java @@ -152,4 +152,6 @@ public class OrgAllInfo implements Serializable { private String contract; /**合同备注*/ private String contractNote; + /** 加盟时间*/ + private java.util.Date franchiseTime; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgInfo.java index 709724a..c049965 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/entity/OrgInfo.java @@ -17,162 +17,239 @@ import lombok.experimental.Accessors; /** * @Description: 机构附加信息 * @Author: zmy - * @Date: 2025-07-08 + * @Date: 2025-07-08 * @Version: V1.0 */ @Data @TableName("nu_org_info") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_org_info对象", description="机构附加信息") +@ApiModel(value = "nu_org_info对象", description = "机构附加信息") public class OrgInfo implements Serializable { private static final long serialVersionUID = 1L; - /**id*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private java.lang.String id; - /**机构ID sys_depart.id 同管理端nu_org_apply_info.pk_id*/ - @Excel(name = "机构ID sys_depart.id 同管理端nu_org_apply_info.pk_id", width = 15) + /** + * 机构ID sys_depart.id 同管理端nu_org_apply_info.pk_id + */ + @Excel(name = "机构ID sys_depart.id 同管理端nu_org_apply_info.pk_id", width = 15) @ApiModelProperty(value = "机构ID sys_depart.id 同管理端nu_org_apply_info.pk_id") private java.lang.String pkId; - /**微信id*/ - @Excel(name = "微信id", width = 15) + /** + * 微信id + */ + @Excel(name = "微信id", width = 15) @ApiModelProperty(value = "微信id") private java.lang.String openId; - /**微信名称*/ - @Excel(name = "微信名称", width = 15) + /** + * 微信名称 + */ + @Excel(name = "微信名称", width = 15) @ApiModelProperty(value = "微信名称") private java.lang.String wechatName; - /**联系电话*/ - @Excel(name = "联系电话", width = 15) + /** + * 联系电话 + */ + @Excel(name = "联系电话", width = 15) @ApiModelProperty(value = "联系电话") private java.lang.String tel; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @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 updateTime; - /**咨询人姓名*/ - @Excel(name = "咨询人姓名", width = 15) + /** + * 咨询人姓名 + */ + @Excel(name = "咨询人姓名", width = 15) @ApiModelProperty(value = "咨询人姓名") private java.lang.String name; - /**性别*/ - @Excel(name = "性别", width = 15) + /** + * 性别 + */ + @Excel(name = "性别", width = 15) @ApiModelProperty(value = "性别") private java.lang.String sex; - /**民族*/ - @Excel(name = "民族", width = 15) + /** + * 民族 + */ + @Excel(name = "民族", width = 15) @ApiModelProperty(value = "民族") private java.lang.String national; - /**出生日期*/ - @Excel(name = "出生日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + /** + * 出生日期 + */ + @Excel(name = "出生日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "出生日期") private java.util.Date birthDate; - /**住址(身份证上)*/ - @Excel(name = "住址(身份证上)", width = 15) + /** + * 住址(身份证上) + */ + @Excel(name = "住址(身份证上)", width = 15) @ApiModelProperty(value = "住址(身份证上)") private java.lang.String idCardAddress; - /**身份证号*/ - @Excel(name = "身份证号", width = 15) + /** + * 身份证号 + */ + @Excel(name = "身份证号", width = 15) @ApiModelProperty(value = "身份证号") private java.lang.String idCard; - /**签发机关*/ - @Excel(name = "签发机关", width = 15) + /** + * 签发机关 + */ + @Excel(name = "签发机关", width = 15) @ApiModelProperty(value = "签发机关") private java.lang.String issuingAuthority; - /**有效开始日期*/ - @Excel(name = "有效开始日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + /** + * 有效开始日期 + */ + @Excel(name = "有效开始日期", width = 15, 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 = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + /** + * 有效结束日期 + */ + @Excel(name = "有效结束日期", width = 15, 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) + /** + * 身份证正面 + */ + @Excel(name = "身份证正面", width = 15) @ApiModelProperty(value = "身份证正面") private java.lang.String cardZmPath; - /**身份证反面*/ - @Excel(name = "身份证反面", width = 15) + /** + * 身份证反面 + */ + @Excel(name = "身份证反面", width = 15) @ApiModelProperty(value = "身份证反面") private java.lang.String cardFmPath; - /**营业执照照片*/ - @Excel(name = "营业执照照片", width = 15) + /** + * 营业执照照片 + */ + @Excel(name = "营业执照照片", width = 15) @ApiModelProperty(value = "营业执照照片") private java.lang.String comBusinessLicense; - /**企业名称*/ - @Excel(name = "企业名称", width = 15) + /** + * 企业名称 + */ + @Excel(name = "企业名称", width = 15) @ApiModelProperty(value = "企业名称") private java.lang.String comName; - /**企业注册地址*/ - @Excel(name = "企业注册地址", width = 15) + /** + * 企业注册地址 + */ + @Excel(name = "企业注册地址", width = 15) @ApiModelProperty(value = "企业注册地址") private java.lang.String comRegisterAddress; - /**企业信用代码*/ - @Excel(name = "企业信用代码", width = 15) + /** + * 企业信用代码 + */ + @Excel(name = "企业信用代码", width = 15) @ApiModelProperty(value = "企业信用代码") private java.lang.String comCreditCode; - /**企业法人*/ - @Excel(name = "企业法人", width = 15) + /** + * 企业法人 + */ + @Excel(name = "企业法人", width = 15) @ApiModelProperty(value = "企业法人") private java.lang.String comLegalPerson; - /**机构地址*/ - @Excel(name = "机构地址", width = 15) + /** + * 机构地址 + */ + @Excel(name = "机构地址", width = 15) @ApiModelProperty(value = "机构地址") private java.lang.String orgAddress; - /**机构位置坐标:经度*/ - @Excel(name = "机构位置坐标:经度", width = 15) + /** + * 机构位置坐标:经度 + */ + @Excel(name = "机构位置坐标:经度", width = 15) @ApiModelProperty(value = "机构位置坐标:经度") private java.lang.String orgCoordinateLo; - /**机构位置坐标:维度*/ - @Excel(name = "机构位置坐标:维度", width = 15) + /** + * 机构位置坐标:维度 + */ + @Excel(name = "机构位置坐标:维度", width = 15) @ApiModelProperty(value = "机构位置坐标:维度") private java.lang.String orgCoordinateLa; - /**机构负责人*/ - @Excel(name = "机构负责人", width = 15) + /** + * 机构负责人 + */ + @Excel(name = "机构负责人", width = 15) @ApiModelProperty(value = "机构负责人") private java.lang.String orgLeader; - /**机构负责人电话*/ - @Excel(name = "机构负责人电话", width = 15) + /** + * 机构负责人电话 + */ + @Excel(name = "机构负责人电话", width = 15) @ApiModelProperty(value = "机构负责人电话") private java.lang.String orgLeaderPhone; - /**机构楼宇牌号*/ - @Excel(name = "机构楼宇牌号", width = 15) + /** + * 机构楼宇牌号 + */ + @Excel(name = "机构楼宇牌号", width = 15) @ApiModelProperty(value = "机构楼宇牌号") private java.lang.String orgBuildingNumber; - /**机构房屋性质*/ - @Excel(name = "机构房屋性质", width = 15) + /** + * 机构房屋性质 + */ + @Excel(name = "机构房屋性质", width = 15) @ApiModelProperty(value = "机构房屋性质") private java.lang.String orgPropertyType; - /**机构建筑面积*/ - @Excel(name = "机构建筑面积", width = 15) + /** + * 机构建筑面积 + */ + @Excel(name = "机构建筑面积", width = 15) @ApiModelProperty(value = "机构建筑面积") private java.lang.Double orgBuildingArea; - /**机构省份 sys_category.id*/ - @Excel(name = "机构省份 sys_category.id", width = 15) + /** + * 机构省份 sys_category.id + */ + @Excel(name = "机构省份 sys_category.id", width = 15) @ApiModelProperty(value = "机构省份 sys_category.id") private java.lang.String orgProvince; - /**机构城市 sys_category.id*/ - @Excel(name = "机构城市 sys_category.id", width = 15) + /** + * 机构城市 sys_category.id + */ + @Excel(name = "机构城市 sys_category.id", width = 15) @ApiModelProperty(value = "机构城市 sys_category.id") private java.lang.String orgCity; - /**机构区域 sys_category.id*/ - @Excel(name = "机构区域 sys_category.id", width = 15) + /** + * 机构区域 sys_category.id + */ + @Excel(name = "机构区域 sys_category.id", width = 15) @ApiModelProperty(value = "机构区域 sys_category.id") private java.lang.String orgDistrict; - /**合同附件*/ - @Excel(name = "合同附件", width = 15) + /** + * 合同附件 + */ + @Excel(name = "合同附件", width = 15) @ApiModelProperty(value = "合同附件") private java.lang.String contract; - /**合同备注*/ - @Excel(name = "合同备注", width = 15) + /** + * 合同备注 + */ + @Excel(name = "合同备注", width = 15) @ApiModelProperty(value = "合同备注") private java.lang.String contractNote; + /** + * 加盟时间 + */ + @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; } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/OrgInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/OrgInfoMapper.java index 300fc11..fb525b7 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/OrgInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/OrgInfoMapper.java @@ -8,10 +8,9 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 机构附加信息 * @Author: zmy - * @Date: 2025-07-08 + * @Date: 2025-07-08 * @Version: V1.0 */ public interface OrgInfoMapper extends BaseMapper { - OrgAllInfo queryOrgInfoByCode(@Param("orgCode") String orgCode); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml index cfe1555..449c39d 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orginfo/mapper/xml/OrgInfoMapper.xml @@ -8,20 +8,7 @@ d.depart_name, d.org_code, d.url, - d.province, - d.city, - d.district, d.plat_type, - d.operation_start_time, - d.operation_end_time, - d.contract_start_time, - d.contract_end_time, - d.mobile, - d.fax, - d.address, - d.memo, - d.payable_amount, - d.pic_url, o.open_id, o.wechat_name, o.tel, @@ -51,7 +38,8 @@ o.org_city, o.org_district, o.contract, - o.contract_note + o.contract_note, + o.franchise_Time from sys_depart d left join nu_org_info o on d.id = o.pk_id