新增员工-机构关系表代码 调整员工包、文件名称

This commit is contained in:
1378012178@qq.com 2025-09-05 14:10:51 +08:00
parent de3378420d
commit 4e09a91948
14 changed files with 457 additions and 42 deletions

View File

@ -0,0 +1,180 @@
package com.nu.modules.employees.controller;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import com.nu.modules.employees.entity.EmployeesOrg;
import com.nu.modules.employees.service.IEmployeesOrgService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: 员工-机构关系中间表
* @Author: jeecg-boot
* @Date: 2025-09-05
* @Version: V1.0
*/
@Api(tags="员工-机构关系中间表")
@RestController
@RequestMapping("/employeesorg/employeesOrg")
@Slf4j
public class EmployeesOrgController extends JeecgController<EmployeesOrg, IEmployeesOrgService> {
@Autowired
private IEmployeesOrgService employeesOrgService;
/**
* 分页列表查询
*
* @param employeesOrg
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "员工-机构关系中间表-分页列表查询")
@ApiOperation(value="员工-机构关系中间表-分页列表查询", notes="员工-机构关系中间表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<EmployeesOrg>> queryPageList(EmployeesOrg employeesOrg,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<EmployeesOrg> queryWrapper = QueryGenerator.initQueryWrapper(employeesOrg, req.getParameterMap());
Page<EmployeesOrg> page = new Page<EmployeesOrg>(pageNo, pageSize);
IPage<EmployeesOrg> pageList = employeesOrgService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param employeesOrg
* @return
*/
@AutoLog(value = "员工-机构关系中间表-添加")
@ApiOperation(value="员工-机构关系中间表-添加", notes="员工-机构关系中间表-添加")
@RequiresPermissions("employeesorg:nu_biz_employees_org:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody EmployeesOrg employeesOrg) {
employeesOrgService.save(employeesOrg);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param employeesOrg
* @return
*/
@AutoLog(value = "员工-机构关系中间表-编辑")
@ApiOperation(value="员工-机构关系中间表-编辑", notes="员工-机构关系中间表-编辑")
@RequiresPermissions("employeesorg:nu_biz_employees_org:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody EmployeesOrg employeesOrg) {
employeesOrgService.updateById(employeesOrg);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "员工-机构关系中间表-通过id删除")
@ApiOperation(value="员工-机构关系中间表-通过id删除", notes="员工-机构关系中间表-通过id删除")
@RequiresPermissions("employeesorg:nu_biz_employees_org:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
employeesOrgService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "员工-机构关系中间表-批量删除")
@ApiOperation(value="员工-机构关系中间表-批量删除", notes="员工-机构关系中间表-批量删除")
@RequiresPermissions("employeesorg:nu_biz_employees_org:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.employeesOrgService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "员工-机构关系中间表-通过id查询")
@ApiOperation(value="员工-机构关系中间表-通过id查询", notes="员工-机构关系中间表-通过id查询")
@GetMapping(value = "/queryById")
public Result<EmployeesOrg> queryById(@RequestParam(name="id",required=true) String id) {
EmployeesOrg employeesOrg = employeesOrgService.getById(id);
if(employeesOrg==null) {
return Result.error("未找到对应数据");
}
return Result.OK(employeesOrg);
}
/**
* 导出excel
*
* @param request
* @param employeesOrg
*/
@RequiresPermissions("employeesorg:nu_biz_employees_org:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, EmployeesOrg employeesOrg) {
return super.exportXls(request, employeesOrg, EmployeesOrg.class, "员工-机构关系中间表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("employeesorg:nu_biz_employees_org:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, EmployeesOrg.class);
}
}

View File

@ -1,39 +1,22 @@
package com.nu.modules.nuEmployeesAdvisoryInfo.controller;
package com.nu.modules.employees.controller;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import com.nu.modules.nuEmployeesAdvisoryInfo.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.nuEmployeesAdvisoryInfo.service.INuEmployeesAdvisoryInfoService;
import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.employees.service.INuEmployeesAdvisoryInfoService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

View File

@ -0,0 +1,81 @@
package com.nu.modules.employees.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 员工-机构关系中间表
* @Author: jeecg-boot
* @Date: 2025-09-05
* @Version: V1.0
*/
@Data
@TableName("nu_biz_employees_org")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_employees_org对象", description="员工-机构关系中间表")
public class EmployeesOrg implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**微信id*/
@Excel(name = "微信id", width = 15)
@ApiModelProperty(value = "微信id")
private java.lang.String openId;
/**员工nu_biz_employees_info.id*/
@Excel(name = "员工nu_biz_employees_info.id", width = 15)
@ApiModelProperty(value = "员工nu_biz_employees_info.id")
private java.lang.String employeesId;
/**机构编码*/
@Excel(name = "机构编码", width = 15)
@ApiModelProperty(value = "机构编码")
private java.lang.String orgCode;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@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 createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@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;
/**是否在线 0在线 1不在线*/
@Excel(name = "是否在线 0在线 1不在线", width = 15)
@ApiModelProperty(value = "是否在线 0在线 1不在线")
private java.lang.String izOnline;
/**冻结状态 0未冻结 1冻结*/
@Excel(name = "冻结状态 0未冻结 1冻结", width = 15)
@ApiModelProperty(value = "冻结状态 0未冻结 1冻结")
private java.lang.String izFreeze;
/**申请状态 1申请中 2通过 3驳回*/
@Excel(name = "申请状态 1申请中 2通过 3驳回", width = 15)
@ApiModelProperty(value = "申请状态 1申请中 2通过 3驳回")
private java.lang.String status;
}

View File

@ -1,15 +1,10 @@
package com.nu.modules.nuEmployeesAdvisoryInfo.entity;
package com.nu.modules.employees.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;

View File

@ -0,0 +1,17 @@
package com.nu.modules.employees.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.employees.entity.EmployeesOrg;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 员工-机构关系中间表
* @Author: jeecg-boot
* @Date: 2025-09-05
* @Version: V1.0
*/
public interface EmployeesOrgMapper extends BaseMapper<EmployeesOrg> {
}

View File

@ -1,10 +1,7 @@
package com.nu.modules.nuEmployeesAdvisoryInfo.mapper;
import java.util.List;
package com.nu.modules.employees.mapper;
import com.nu.modules.EmployessInfo.entity.EmployeesAdvisoryInfoEntity;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.nuEmployeesAdvisoryInfo.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.employees.mapper.EmployeesOrgMapper">
</mapper>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.nuEmployeesAdvisoryInfo.mapper.NuEmployeesAdvisoryInfoMapper">
<mapper namespace="com.nu.modules.employees.mapper.NuEmployeesAdvisoryInfoMapper">
<update id="updateByTel">
update nu_biz_advisory_info
@ -39,4 +39,5 @@
</set>
where open_id = #{openId}
</update>
</mapper>
</mapper>

View File

@ -0,0 +1,14 @@
package com.nu.modules.employees.service;
import com.nu.modules.employees.entity.EmployeesOrg;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 员工-机构关系中间表
* @Author: jeecg-boot
* @Date: 2025-09-05
* @Version: V1.0
*/
public interface IEmployeesOrgService extends IService<EmployeesOrg> {
}

View File

@ -1,6 +1,6 @@
package com.nu.modules.nuEmployeesAdvisoryInfo.service;
package com.nu.modules.employees.service;
import com.nu.modules.nuEmployeesAdvisoryInfo.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;
import com.baomidou.mybatisplus.extension.service.IService;
/**

View File

@ -0,0 +1,19 @@
package com.nu.modules.employees.service.impl;
import com.nu.modules.employees.entity.EmployeesOrg;
import com.nu.modules.employees.mapper.EmployeesOrgMapper;
import com.nu.modules.employees.service.IEmployeesOrgService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 员工-机构关系中间表
* @Author: jeecg-boot
* @Date: 2025-09-05
* @Version: V1.0
*/
@Service
public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, EmployeesOrg> implements IEmployeesOrgService {
}

View File

@ -1,13 +1,11 @@
package com.nu.modules.nuEmployeesAdvisoryInfo.service.impl;
package com.nu.modules.employees.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.modules.EmployessInfo.entity.EmployeesAdvisoryInfoEntity;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo;
import com.nu.modules.nuEmployeesAdvisoryInfo.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.nuEmployeesAdvisoryInfo.mapper.NuEmployeesAdvisoryInfoMapper;
import com.nu.modules.nuEmployeesAdvisoryInfo.service.INuEmployeesAdvisoryInfoService;
import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.employees.mapper.NuEmployeesAdvisoryInfoMapper;
import com.nu.modules.employees.service.INuEmployeesAdvisoryInfoService;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

View File

@ -0,0 +1,35 @@
package com.nu.modules.wechat.employess.api;
import com.nu.dto.EmployeesApplyMQDto;
import com.nu.utils.RabbitMQUtil;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/api/employessapply")
public class EmployessApplyApi {
@Autowired
private RabbitMQUtil rabbitMQUtil;
/**
* 员工申请加入机构
* @param dto
* @return
*/
@AutoLog(value = "员工申请-加入机构申请")
@PostMapping("/apply")
public Result<Object> saveApiEmployess(@RequestBody EmployeesApplyMQDto dto) {
if(StringUtils.isBlank(dto.getOrgCode())){
return Result.error("申请失败");
}
rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.apply", dto);
return Result.ok();
}
}

View File

@ -0,0 +1,90 @@
package com.nu.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 员工申请
* @Author: jeecg-boot
* @Date: 2025-09-05
* @Version: V1.0
*/
@Data
public class EmployeesApplyMQDto implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
private String id;
/**员工id*/
private String employeeId;
/**姓名*/
private String name;
/**性别*/
private String sex;
/**民族*/
private String national;
/**身份证号*/
private String idCard;
/**联系电话*/
private String tel;
/**出生日期*/
private Date dateOfBirth;
/**婚否*/
private String marriedOrNot;
/**身高*/
private Double height;
/**体重*/
private Double weight;
/**家庭住址*/
private String address;
/**是否吸烟*/
private String isSmoking;
/**健康状况*/
private String healthStatus;
/**户籍所在地*/
private String houseAddress;
/**政治面貌*/
private String politicalAppearance;
/**紧急联系人*/
private String emergencyContact;
/**紧急联系人电话*/
private String emergencyTel;
/**紧急联系人与本人关系*/
private String emergencyRelationship;
/**户口性质*/
private String hukouNature;
/**身份证正面*/
private String idCardPositive;
/**身份证反面*/
private String idCardNegative;
/**健康证正面*/
private String healthCertificatePositive;
/**健康证反面*/
private String healthCertificateNegative;
/**银行卡正面*/
private String bankPositive;
/**银行卡反面*/
private String bankNegative;
/**资质证*/
private String qualification;
/**无犯罪证明*/
private String noCrimeCertificate;
/**区域*/
private String regional;
/**是否删除 0未删除 1删除*/
private String delFlag;
/**申请日期*/
private Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
private Date updateTime;
/**申请状态 0历史 1申请中 2通过 3驳回*/
private String status;
/**审核备注*/
private String auditContent;
/**机构编码*/
private String orgCode;
}