diff --git a/nursing-unit-common/src/main/java/com/nu/dto/SysDepartDto.java b/nursing-unit-common/src/main/java/com/nu/dto/SysDepartDto.java new file mode 100644 index 00000000..8fa0dd0c --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/SysDepartDto.java @@ -0,0 +1,258 @@ +package com.nu.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +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.util.Date; + +/** + *
+ * 部门表 + *
+ * + * @Author Steve + * @Since 2019-01-22 + */ +@Data +public class SysDepartDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(type = IdType.ASSIGN_ID) + private String id; + /** + * 父机构ID + */ + private String parentId; + /** + * 机构/部门名称 + */ + @Excel(name = "机构/部门名称", width = 15) + private String departName; + /** + * 英文名 + */ + @Excel(name = "英文名", width = 15) + private String departNameEn; + /** + * 缩写 + */ + private String departNameAbbr; + /** + * 排序 + */ + @Excel(name = "排序", width = 15) + private Integer departOrder; + /** + * 描述 + */ + @Excel(name = "描述", width = 15) + private String description; + /** + * 机构类型 + */ + private String orgType; + /** + * 机构编码 + */ + @Excel(name = "机构编码", width = 15) + private String orgCode; + /** + * 省份 + */ + @Excel(name = "省份", width = 30) + private String province; + /** + * 城市 + */ + @Excel(name = "城市", width = 30) + private String city; + /** + * 区县 + */ + @Excel(name = "区县", width = 30) + private String district; + /** + * 手机号 + */ + @Excel(name = "手机号", width = 15) + private String mobile; + /** + * 地址 + */ + @Excel(name = "地址", width = 15) + private String address; + /** + * 创建人 + */ + private String createBy; + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + /** + * 更新人 + */ + private String updateBy; + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 加盟时间 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "加盟时间") + private Date franchiseTime; + /** + * 回复内容 + */ + private String headPath; + /** + * 回复时间 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date replyTime; + /** + * 回复人 + */ + private String handleBy; + + /** + * 微信id + */ + @Excel(name = "微信id", width = 15) + @ApiModelProperty(value = "微信id") + private String openId; + /** + * 联系电话 + */ + @Excel(name = "联系电话", width = 15) + @ApiModelProperty(value = "联系电话") + private String tel; + /** + * 咨询人姓名 + */ + @Excel(name = "咨询人姓名", width = 15) + @ApiModelProperty(value = "咨询人姓名") + private String name; + /** + * 性别 + */ + @Excel(name = "性别", width = 15) + @ApiModelProperty(value = "性别") + private String sex; + /** + * 签发机关 + */ + @Excel(name = "签发机关", width = 15) + @ApiModelProperty(value = "签发机关") + private String issuingAuthority; + /** + * 企业名称 + */ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private String comName; + /** + * 企业注册地址 + */ + @Excel(name = "企业注册地址", width = 15) + @ApiModelProperty(value = "企业注册地址") + private String comRegisterAddress; + /** + * 企业信用代码 + */ + @Excel(name = "企业信用代码", width = 15) + @ApiModelProperty(value = "企业信用代码") + private String comCreditCode; + /** + * 企业法人 + */ + @Excel(name = "企业法人", width = 15) + @ApiModelProperty(value = "企业法人") + private String comLegalPerson; + /** + * 机构地址 + */ + @Excel(name = "机构地址", width = 15) + @ApiModelProperty(value = "机构地址") + private String orgAddress; + /** + * 机构负责人 + */ + @Excel(name = "机构负责人", width = 15) + @ApiModelProperty(value = "机构负责人") + private String orgLeader; + /** + * 机构负责人电话 + */ + @Excel(name = "机构负责人电话", width = 15) + @ApiModelProperty(value = "机构负责人电话") + private String orgLeaderPhone; + /** + * 机构楼宇牌号 + */ + @Excel(name = "机构楼宇牌号", width = 15) + @ApiModelProperty(value = "机构楼宇牌号") + private String orgBuildingNumber; + /** + * 机构房屋性质 + */ + @Excel(name = "机构房屋性质", width = 15) + @ApiModelProperty(value = "机构房屋性质") + private String orgPropertyType; + /** + * 机构建筑面积 + */ + @Excel(name = "机构建筑面积", width = 15) + @ApiModelProperty(value = "机构建筑面积") + private Double orgBuildingArea; + /** + * 机构省份 sys_category.id + */ + @Excel(name = "机构省份", width = 15) + @ApiModelProperty(value = "机构省份") + @Dict(dictTable = "sys_category", dicCode = "id", dicText = "name") + private String orgProvince; + /** + * 机构城市 sys_category.id + */ + @Excel(name = "机构城市", width = 15) + @ApiModelProperty(value = "机构城市") + @Dict(dictTable = "sys_category", dicCode = "id", dicText = "name") + private String orgCity; + /** + * 机构区域 sys_category.id + */ + @Excel(name = "机构区域", width = 15) + @ApiModelProperty(value = "机构区域") + @Dict(dictTable = "sys_category", dicCode = "id", dicText = "name") + private String orgDistrict; + + private String izPz; + private String orgNetUrl;//小程序机构后台网址 + @Excel(name = "应缴金额", width = 15) + private BigDecimal payableAmount; + + //update-begin---author:wangshuai ---date:20200308 for:[JTC-119]在部门管理菜单下设置部门负责人,新增字段负责人ids和旧的负责人ids + + +} diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/DynamicQueueNameProvider.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/DynamicQueueNameProvider.java index 382a1d7c..9e88c2bd 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/DynamicQueueNameProvider.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/DynamicQueueNameProvider.java @@ -139,4 +139,18 @@ public class DynamicQueueNameProvider { return getUpUserEmployeesIdQueueName(); } + + public String addSysDepartDtoQueueName() { + JSONObject deptInfo = sysBaseAPI.getDeptInfo(); + String orgCode = deptInfo.getString("code"); + if (StringUtils.isNotBlank(orgCode)) { + return orgCode + ".orgapply.addSysDepartDto"; + } else { + return ""; + } + } + + public String addSysDepartDtoKeyName() { + return addSysDepartDtoQueueName(); + } } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java index f5ceee1d..ae192a79 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.nu.dto.EmployeesApplyMQDto; +import com.nu.dto.SysDepartDto; import com.nu.dto.SysUserMQDto; import com.nu.entity.SysUserEntity; import com.nu.modules.employeesInfo.entity.BizEmployeesInfo; @@ -1151,4 +1152,19 @@ public class EmployeesMQListener { //修改sysUser表的员工id employeesInfoService.UpUserEmployeesId(dto.getId()); } + + /** + * 更新机构信息 + */ + @RabbitListener( + bindings = @QueueBinding( + value = @Queue(name = "#{employeesAsyncDQNP.addSysDepartDtoKeyName()}"), + exchange = @Exchange(name = "hldy.org", type = ExchangeTypes.DIRECT), + key = "#{employeesAsyncDQNP.addSysDepartDtoKeyName()}" + ), + errorHandler = "employeesMQErrorHandler" + ) + public void handleAddOrgInfo(SysDepartDto dto) { + sysBaseAPI.addOrgInfo(dto); + } } diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java index df6ae3ff..ae0fef5c 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java @@ -1,6 +1,7 @@ package org.jeecg.common.system.api; import com.alibaba.fastjson.JSONObject; +import com.nu.dto.SysDepartDto; import org.jeecg.common.api.CommonAPI; import org.jeecg.common.api.dto.DataLogDTO; import org.jeecg.common.api.dto.OnlineAuthDTO; @@ -551,4 +552,6 @@ public interface ISysBaseAPI extends CommonAPI { JSONObject getDeptInfo(); String getOrgName(); + + void addOrgInfo(SysDepartDto dto); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index 55581609..d98c4a11 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.base.Joiner; import com.google.common.collect.Maps; +import com.nu.dto.SysDepartDto; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.modules.message.entity.SysMessageTemplate; import org.jeecg.modules.message.handle.impl.DdSendMsgHandle; @@ -1856,5 +1857,12 @@ public class SysBaseApiImpl implements ISysBaseAPI { return sysDepartService.getOrgName(); } + @Override + public void addOrgInfo(SysDepartDto dto) { + SysDepart sysDepart = new SysDepart(); + BeanUtils.copyProperties(dto,sysDepart); + sysDepartService.save(sysDepart); + } + }