diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/EmployeesOrgController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/EmployeesOrgController.java new file mode 100644 index 0000000..71a2259 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/EmployeesOrgController.java @@ -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 { + @Autowired + private IEmployeesOrgService employeesOrgService; + + /** + * 分页列表查询 + * + * @param employeesOrg + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "员工-机构关系中间表-分页列表查询") + @ApiOperation(value="员工-机构关系中间表-分页列表查询", notes="员工-机构关系中间表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployeesOrg employeesOrg, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employeesOrg, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage 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 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 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 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 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 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); + } + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/controller/NuEmployeesAdvisoryInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java similarity index 85% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/controller/NuEmployeesAdvisoryInfoController.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java index 7d1ace8..dec6227 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/controller/NuEmployeesAdvisoryInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java @@ -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; diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java new file mode 100644 index 0000000..740f2c7 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java @@ -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; +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/entity/NuEmployeesAdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java similarity index 96% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/entity/NuEmployeesAdvisoryInfo.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java index 55c1829..7331f0c 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/entity/NuEmployeesAdvisoryInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java @@ -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; diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java new file mode 100644 index 0000000..d8ca5b5 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java @@ -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 { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/NuEmployeesAdvisoryInfoMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java similarity index 71% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/NuEmployeesAdvisoryInfoMapper.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java index 58b0891..bc1dc71 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/NuEmployeesAdvisoryInfoMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/NuEmployeesAdvisoryInfoMapper.java @@ -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; /** diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml new file mode 100644 index 0000000..404df9e --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml similarity index 92% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml index 773ba90..05005ee 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml @@ -1,6 +1,6 @@ - + update nu_biz_advisory_info @@ -39,4 +39,5 @@ where open_id = #{openId} - \ No newline at end of file + + diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java new file mode 100644 index 0000000..6f7dea2 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java @@ -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 { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/INuEmployeesAdvisoryInfoService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/INuEmployeesAdvisoryInfoService.java similarity index 66% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/INuEmployeesAdvisoryInfoService.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/INuEmployeesAdvisoryInfoService.java index 731a49c..783f3ce 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/INuEmployeesAdvisoryInfoService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/INuEmployeesAdvisoryInfoService.java @@ -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; /** diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java new file mode 100644 index 0000000..c49b4cf --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java @@ -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 implements IEmployeesOrgService { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java similarity index 86% rename from nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index 3694284..254a9ed 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuEmployeesAdvisoryInfo/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -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; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessApplyApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessApplyApi.java new file mode 100644 index 0000000..8ba42cb --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessApplyApi.java @@ -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 saveApiEmployess(@RequestBody EmployeesApplyMQDto dto) { + if(StringUtils.isBlank(dto.getOrgCode())){ + return Result.error("申请失败"); + } + rabbitMQUtil.sendToExchange("hldy.employees", dto.getOrgCode() + ".employees.apply", dto); + return Result.ok(); + } +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java new file mode 100644 index 0000000..49e2000 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java @@ -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; +}