From 8372fa02a0038970921fe938353fd89f76b79042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 3 Feb 2026 10:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D=EF=BC=9Aemployess=E6=94=B9?= =?UTF-8?q?=E4=B8=BAemployees=EF=BC=8C=E5=8C=85=E6=8B=AC=E7=B1=BB=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=90=8D=EF=BC=8C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=8D=EF=BC=8C=E5=8F=82=E6=95=B0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmployeesApi.java} | 15 +- .../org/jeecg/common/system/vo/LoginUser.java | 2 +- .../org/jeecg/config/shiro/ShiroConfig.java | 2 +- .../java/com/nu/entity/SysUserEntity.java | 2 +- .../com/nu/modules/IEmployeesInfoApi.java | 4 +- .../impl/BizEmployeesInfoServiceImpl.java | 19 ++- .../NuAppEmployeesPermissionController.java} | 128 ++++++++---------- .../entity/NuAppEmployeesPermission.java} | 18 +-- .../NuAppEmployeesPermissionMapper.java | 18 +++ .../xml/NuAppEmployeesPermissionMapper.xml} | 6 +- .../INuAppEmployeesPermissionService.java | 19 +++ .../NuAppEmployeesPermissionServiceImpl.java} | 29 ++-- .../NuEmployeesAdvisoryInfoController.java | 6 +- .../entity/NuEmployeesAdvisoryInfo.java | 2 +- .../mapper/NuEmployeesAdvisoryInfoMapper.java | 4 +- .../xml/NuEmployeesAdvisoryInfoMapper.xml | 2 +- .../INuEmployeesAdvisoryInfoService.java | 4 +- .../NuEmployeesAdvisoryInfoServiceImpl.java | 8 +- .../NuAppEmployessPermissionMapper.java | 19 --- .../INuAppEmployessPermissionService.java | 20 --- .../listener/EmployeesMQListener.java | 12 +- .../impl/NuInvoicingPddMainServiceImpl.java | 4 +- .../controller/NuBaseInfoController.java | 2 +- .../modules/nubaseinfo/entity/NuBaseInfo.java | 2 +- .../nubaseinfo/mapper/NuBaseInfoMapper.java | 4 +- .../mapper/xml/NuBaseInfoMapper.xml | 8 +- .../service/INuBaseInfoService.java | 2 +- .../service/impl/NuBaseInfoServiceImpl.java | 8 +- .../impl/DirectiveOrderPadServiceImpl.java | 6 +- .../impl/DirectiveOrderServiceImpl.java | 2 +- .../controller/ServiceTagController.java | 6 +- .../servicetag/mapper/ServiceTagMapper.java | 2 +- .../mapper/xml/ServiceTagMapper.xml | 2 +- .../service/IServiceTagService.java | 2 +- .../service/impl/ServiceTagServiceImpl.java | 4 +- .../system/controller/LoginController.java | 2 +- .../system/controller/SysUserController.java | 8 +- .../jeecg/modules/system/entity/SysUser.java | 2 +- .../system/service/impl/SysUserApiImpl.java | 4 +- .../service/impl/SysUserServiceImpl.java | 2 +- 40 files changed, 192 insertions(+), 219 deletions(-) rename nursing-unit-api/src/main/java/com/nu/modules/{employess/EmployessApi.java => employees/EmployeesApi.java} (72%) rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessPermission/controller/NuAppEmployessPermissionController.java => employeesPermission/controller/NuAppEmployeesPermissionController.java} (65%) rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessPermission/entity/NuAppEmployessPermission.java => employeesPermission/entity/NuAppEmployeesPermission.java} (75%) create mode 100644 nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/NuAppEmployeesPermissionMapper.java rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessPermission/mapper/xml/NuAppEmployessPermissionMapper.xml => employeesPermission/mapper/xml/NuAppEmployeesPermissionMapper.xml} (65%) create mode 100644 nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/service/INuAppEmployeesPermissionService.java rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessPermission/service/impl/NuAppEmployessPermissionServiceImpl.java => employeesPermission/service/impl/NuAppEmployeesPermissionServiceImpl.java} (65%) rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessadvisiory => employeesadvisiory}/controller/NuEmployeesAdvisoryInfoController.java (98%) rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessadvisiory => employeesadvisiory}/entity/NuEmployeesAdvisoryInfo.java (99%) rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessadvisiory => employeesadvisiory}/mapper/NuEmployeesAdvisoryInfoMapper.java (70%) rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessadvisiory => employeesadvisiory}/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml (74%) rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessadvisiory => employeesadvisiory}/service/INuEmployeesAdvisoryInfoService.java (75%) rename nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/{employessadvisiory => employeesadvisiory}/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java (96%) delete mode 100644 nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/mapper/NuAppEmployessPermissionMapper.java delete mode 100644 nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/service/INuAppEmployessPermissionService.java diff --git a/nursing-unit-api/src/main/java/com/nu/modules/employess/EmployessApi.java b/nursing-unit-api/src/main/java/com/nu/modules/employees/EmployeesApi.java similarity index 72% rename from nursing-unit-api/src/main/java/com/nu/modules/employess/EmployessApi.java rename to nursing-unit-api/src/main/java/com/nu/modules/employees/EmployeesApi.java index d8243292..6251fc01 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/employess/EmployessApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/employees/EmployeesApi.java @@ -1,11 +1,8 @@ -package com.nu.modules.employess; +package com.nu.modules.employees; -import com.alibaba.fastjson.JSONObject; -import com.google.common.collect.Maps; import com.nu.modules.IEmployeesInfoApi; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.api.ISysBaseAPI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.GetMapping; @@ -21,8 +18,8 @@ import java.util.Map; * @date 2025-5-22 08:43:05 */ @RestController -@RequestMapping("/api/employessInfo") -public class EmployessApi { +@RequestMapping("/api/employeesInfo") +public class EmployeesApi { @Lazy @Autowired @@ -33,11 +30,11 @@ public class EmployessApi { * @return */ @GetMapping("/getPermissionList") - public Result getPermissionList(String employessId){ - if (StringUtils.isBlank(employessId)){ + public Result getPermissionList(String employeesId){ + if (StringUtils.isBlank(employeesId)){ return Result.error("参数错误"); } - List> result = employeesInfoApi.getPermissionList(employessId); + List> result = employeesInfoApi.getPermissionList(employeesId); return Result.ok(result); } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java index 4a3cbe37..aa991a52 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java @@ -143,6 +143,6 @@ public class LoginUser { * 员工id */ @SensitiveField - private String employessId; + private String employeesId; } diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index d3a9c712..35859492 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -96,7 +96,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/api/pad/invoicing/getCgdInfoByCgdId", "anon"); //查询采购单列表详细信息（小程序使用） // filterChainDefinitionMap.put("/api/pad/baseInfo/queryPadPageList", "anon"); //查询采购单列表详细信息（小程序使用） // filterChainDefinitionMap.put("/api/pad/invoicing/pdd/**", "anon"); //查询盘点单 -// filterChainDefinitionMap.put("/api/employessInfo/**", "anon"); //测试员工接口 +// filterChainDefinitionMap.put("/api/employeesInfo/**", "anon"); //测试员工接口 // filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口 // filterChainDefinitionMap.put("/api/pad/qingling/**", "anon"); //测试请领对应的接口 // filterChainDefinitionMap.put("/api/pad/care/**", "anon"); //服务指令 diff --git a/nursing-unit-common/src/main/java/com/nu/entity/SysUserEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/SysUserEntity.java index b4112437..98fc8ae5 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/SysUserEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/SysUserEntity.java @@ -167,7 +167,7 @@ public class SysUserEntity implements Serializable { /** * 员工id */ - private String employessId; + private String employeesId; @Dict(dicCode = "login_type") private String loginType; diff --git a/nursing-unit-employee/nu-employee-api/nu-employee-local-api/src/main/java/com/nu/modules/IEmployeesInfoApi.java b/nursing-unit-employee/nu-employee-api/nu-employee-local-api/src/main/java/com/nu/modules/IEmployeesInfoApi.java index 2586bb7d..1d7605a0 100644 --- a/nursing-unit-employee/nu-employee-api/nu-employee-local-api/src/main/java/com/nu/modules/IEmployeesInfoApi.java +++ b/nursing-unit-employee/nu-employee-api/nu-employee-local-api/src/main/java/com/nu/modules/IEmployeesInfoApi.java @@ -6,9 +6,9 @@ import java.util.List; import java.util.Map; public interface IEmployeesInfoApi { - List> getPermissionList(String employessId); + List> getPermissionList(String employeesId); List queryEmpList(EmployeesInfoEntity dto); - void upHeadPath(String employessId, String avatar); + void upHeadPath(String employeesId, String avatar); } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java index 9f746243..28d99674 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java @@ -2,16 +2,13 @@ package com.nu.modules.employeesInfo.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nu.entity.EmployeesInfoEntity; import com.nu.modules.IEmployeesInfoApi; import com.nu.modules.employeesInfo.entity.BizEmployeesInfo; import com.nu.modules.employeesInfo.mapper.BizEmployeesInfoMapper; import com.nu.modules.employeesInfo.service.IBizEmployeesInfoService; -import com.nu.modules.employessPermission.entity.NuAppEmployessPermission; -import com.nu.modules.employessPermission.service.INuAppEmployessPermissionService; -import com.nu.modules.nuidPermission.entity.NuAppNuidPermission; -import com.nu.modules.nuidPermission.service.INuAppNuidPermissionService; +import com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission; +import com.nu.modules.employeesPermission.service.INuAppEmployeesPermissionService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,13 +31,13 @@ import java.util.stream.Collectors; public class BizEmployeesInfoServiceImpl extends ServiceImpl implements IBizEmployeesInfoService, IEmployeesInfoApi { @Autowired - private INuAppEmployessPermissionService nuAppEmployessPermissionService; + private INuAppEmployeesPermissionService nuAppEmployeesPermissionService; @Override - public List> getPermissionList(String employessId) { - List permissionList = nuAppEmployessPermissionService.listByEmployessId(employessId); + public List> getPermissionList(String employeesId) { + List permissionList = nuAppEmployeesPermissionService.listByEmployeesId(employeesId); List> originalData = new ArrayList<>(); - for (NuAppEmployessPermission par : permissionList) { + for (NuAppEmployeesPermission par : permissionList) { Map map = new HashMap<>(); map.put("nuId", par.getNuId()); map.put("menuName", par.getMenuName()); @@ -60,9 +57,9 @@ public class BizEmployeesInfoServiceImpl extends ServiceImpl { +public class NuAppEmployeesPermissionController extends JeecgController { @Autowired - private INuAppEmployessPermissionService nuAppEmployessPermissionService; + private INuAppEmployeesPermissionService nuAppEmployeesPermissionService; @Autowired private INuAppPermissionService nuAppPermissionService; @@ -68,52 +56,52 @@ public class NuAppEmployessPermissionController extends JeecgController> queryPageList(NuAppEmployessPermission nuAppEmployessPermission, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuAppEmployessPermission, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = nuAppEmployessPermissionService.page(page, queryWrapper); + public Result> queryPageList(NuAppEmployeesPermission nuAppEmployeesPermission, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuAppEmployeesPermission, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuAppEmployeesPermissionService.page(page, queryWrapper); return Result.OK(pageList); } /** * 添加 * - * @param nuAppEmployessPermission + * @param nuAppEmployeesPermission * @return */ - @AutoLog(value = "nu_app_employess_permission-添加") - @ApiOperation(value="nu_app_employess_permission-添加", notes="nu_app_employess_permission-添加") - @RequiresPermissions("employessPermission:nu_app_employess_permission:add") + @AutoLog(value = "nu_app_employees_permission-添加") + @ApiOperation(value="nu_app_employees_permission-添加", notes="nu_app_employees_permission-添加") + @RequiresPermissions("employeesPermission:nu_app_employees_permission:add") @PostMapping(value = "/add") - public Result add(@RequestBody NuAppEmployessPermission nuAppEmployessPermission) { - nuAppEmployessPermissionService.save(nuAppEmployessPermission); + public Result add(@RequestBody NuAppEmployeesPermission nuAppEmployeesPermission) { + nuAppEmployeesPermissionService.save(nuAppEmployeesPermission); return Result.OK("添加成功！"); } /** * 编辑 * - * @param nuAppEmployessPermission + * @param nuAppEmployeesPermission * @return */ - @AutoLog(value = "nu_app_employess_permission-编辑") - @ApiOperation(value="nu_app_employess_permission-编辑", notes="nu_app_employess_permission-编辑") - @RequiresPermissions("employessPermission:nu_app_employess_permission:edit") + @AutoLog(value = "nu_app_employees_permission-编辑") + @ApiOperation(value="nu_app_employees_permission-编辑", notes="nu_app_employees_permission-编辑") + @RequiresPermissions("employeesPermission:nu_app_employees_permission:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody NuAppEmployessPermission nuAppEmployessPermission) { - nuAppEmployessPermissionService.updateById(nuAppEmployessPermission); + public Result edit(@RequestBody NuAppEmployeesPermission nuAppEmployeesPermission) { + nuAppEmployeesPermissionService.updateById(nuAppEmployeesPermission); return Result.OK("编辑成功!"); } @@ -123,12 +111,12 @@ public class NuAppEmployessPermissionController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - nuAppEmployessPermissionService.removeById(id); + nuAppEmployeesPermissionService.removeById(id); return Result.OK("删除成功!"); } @@ -138,12 +126,12 @@ public class NuAppEmployessPermissionController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.nuAppEmployessPermissionService.removeByIds(Arrays.asList(ids.split(","))); + this.nuAppEmployeesPermissionService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -153,27 +141,27 @@ public class NuAppEmployessPermissionController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - NuAppEmployessPermission nuAppEmployessPermission = nuAppEmployessPermissionService.getById(id); - if(nuAppEmployessPermission==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + NuAppEmployeesPermission nuAppEmployeesPermission = nuAppEmployeesPermissionService.getById(id); + if(nuAppEmployeesPermission==null) { return Result.error("未找到对应数据"); } - return Result.OK(nuAppEmployessPermission); + return Result.OK(nuAppEmployeesPermission); } /** * 导出excel * * @param request - * @param nuAppEmployessPermission + * @param nuAppEmployeesPermission */ - @RequiresPermissions("employessPermission:nu_app_employess_permission:exportXls") + @RequiresPermissions("employeesPermission:nu_app_employees_permission:exportXls") @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, NuAppEmployessPermission nuAppEmployessPermission) { - return super.exportXls(request, nuAppEmployessPermission, NuAppEmployessPermission.class, "nu_app_employess_permission"); + public ModelAndView exportXls(HttpServletRequest request, NuAppEmployeesPermission nuAppEmployeesPermission) { + return super.exportXls(request, nuAppEmployeesPermission, NuAppEmployeesPermission.class, "nu_app_employees_permission"); } /** @@ -183,10 +171,10 @@ public class NuAppEmployessPermissionController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, NuAppEmployessPermission.class); + return super.importExcel(request, response, NuAppEmployeesPermission.class); } /** * 用户角色授权功能，查询菜单权限树 @@ -245,11 +233,11 @@ public class NuAppEmployessPermissionController extends JeecgController> queryEmployessPermission(@RequestParam(name = "employessId", required = true) String employessId) { + @RequestMapping(value = "/queryEmployeesPermission", method = RequestMethod.GET) + public Result> queryEmployeesPermission(@RequestParam(name = "employeesId", required = true) String employeesId) { Result> result = new Result<>(); try { - List list = nuAppEmployessPermissionService.list(new QueryWrapper().lambda().eq(NuAppEmployessPermission::getRoleId, employessId)); + List list = nuAppEmployeesPermissionService.list(new QueryWrapper().lambda().eq(NuAppEmployeesPermission::getRoleId, employeesId)); result.setResult(list.stream().map(sysRolePermission -> String.valueOf(sysRolePermission.getPermissionId())).collect(Collectors.toList())); result.setSuccess(true); } catch (Exception e) { @@ -272,7 +260,7 @@ public class NuAppEmployessPermissionController extends JeecgController result = new Result<>(); JSONObject objPar = jsonList.getJSONObject(0); String roleIdAll = objPar.getString("roleId"); - nuAppEmployessPermissionService.remove(new QueryWrapper().lambda().eq(NuAppEmployessPermission::getRoleId, roleIdAll)); + nuAppEmployeesPermissionService.remove(new QueryWrapper().lambda().eq(NuAppEmployeesPermission::getRoleId, roleIdAll)); try { for (int i = 0; i < jsonList.size(); i++) { JSONObject obj = jsonList.getJSONObject(i); @@ -310,10 +298,10 @@ public class NuAppEmployessPermissionController extends JeecgController().lambda().eq(NuAppEmployessPermission::getNuId, nuId).eq(NuAppEmployessPermission::getRoleId, roleId)); +// nuAppEmployeesPermissionService.remove(new QueryWrapper().lambda().eq(NuAppEmployeesPermission::getNuId, nuId).eq(NuAppEmployeesPermission::getRoleId, roleId)); } // System.out.println("第 " + i + " 个对象:"); @@ -331,7 +319,7 @@ public class NuAppEmployessPermissionController extends JeecgController { + + List listByEmployeesId(@Param("roleId") String employeesId); +} diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/mapper/xml/NuAppEmployessPermissionMapper.xml b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/xml/NuAppEmployeesPermissionMapper.xml similarity index 65% rename from nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/mapper/xml/NuAppEmployessPermissionMapper.xml rename to nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/xml/NuAppEmployeesPermissionMapper.xml index 75a91042..2cc4fe39 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/mapper/xml/NuAppEmployessPermissionMapper.xml +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/mapper/xml/NuAppEmployeesPermissionMapper.xml @@ -1,8 +1,8 @@ - - + select a.*,b.name as menu_name,b.menu_code from nu_app_employees_permission a left join nu_app_permission b on a.permission_id = b.id diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/service/INuAppEmployeesPermissionService.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/service/INuAppEmployeesPermissionService.java new file mode 100644 index 00000000..3d9c7d1d --- /dev/null +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/service/INuAppEmployeesPermissionService.java @@ -0,0 +1,19 @@ +package com.nu.modules.employeesPermission.service; + +import com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * @Description: nu_app_employees_permission + * @Author: jeecg-boot + * @Date: 2026-01-04 + * @Version: V1.0 + */ +public interface INuAppEmployeesPermissionService extends IService { + + void saveRolePermission(String roleId, String permissionIds, String lastPermissionIds,String nuId); + + List listByEmployeesId(String employeesId); +} diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/service/impl/NuAppEmployessPermissionServiceImpl.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/service/impl/NuAppEmployeesPermissionServiceImpl.java similarity index 65% rename from nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/service/impl/NuAppEmployessPermissionServiceImpl.java rename to nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/service/impl/NuAppEmployeesPermissionServiceImpl.java index 4552d3ee..45674f68 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/service/impl/NuAppEmployessPermissionServiceImpl.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/service/impl/NuAppEmployeesPermissionServiceImpl.java @@ -1,10 +1,9 @@ -package com.nu.modules.employessPermission.service.impl; +package com.nu.modules.employeesPermission.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.nu.modules.employessPermission.entity.NuAppEmployessPermission; -import com.nu.modules.employessPermission.mapper.NuAppEmployessPermissionMapper; -import com.nu.modules.employessPermission.service.INuAppEmployessPermissionService; -import com.nu.modules.nuidPermission.entity.NuAppNuidPermission; +import com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission; +import com.nu.modules.employeesPermission.mapper.NuAppEmployeesPermissionMapper; +import com.nu.modules.employeesPermission.service.INuAppEmployeesPermissionService; import org.jeecg.common.util.IpUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; @@ -16,13 +15,13 @@ import javax.servlet.http.HttpServletRequest; import java.util.*; /** - * @Description: nu_app_employess_permission + * @Description: nu_app_employees_permission * @Author: jeecg-boot * @Date: 2026-01-04 * @Version: V1.0 */ @Service -public class NuAppEmployessPermissionServiceImpl extends ServiceImpl implements INuAppEmployessPermissionService { +public class NuAppEmployeesPermissionServiceImpl extends ServiceImpl implements INuAppEmployeesPermissionService { @Override public void saveRolePermission(String roleId, String permissionIds,String lastPermissionIds, String nuId) { @@ -35,12 +34,12 @@ public class NuAppEmployessPermissionServiceImpl extends ServiceImpl().lambda().eq(NuAppEmployessPermission::getRoleId, roleId).eq(NuAppEmployessPermission::getNuId, nuId)); + this.remove(new QueryWrapper().lambda().eq(NuAppEmployeesPermission::getRoleId, roleId).eq(NuAppEmployeesPermission::getNuId, nuId)); if (oConvertUtils.isNotEmpty(permissionIds)){ - List list = new ArrayList(); + List list = new ArrayList(); for (String permissionId : permissionIds.split(",")){ - NuAppEmployessPermission rolepms = new NuAppEmployessPermission(roleId, permissionId,nuId); + NuAppEmployeesPermission rolepms = new NuAppEmployeesPermission(roleId, permissionId,nuId); rolepms.setOperateDate(new Date()); rolepms.setOperateIp(ip); list.add(rolepms); @@ -52,10 +51,10 @@ public class NuAppEmployessPermissionServiceImpl extends ServiceImpl add = getDiff(lastPermissionIds,permissionIds,nuId); // if(add!=null && add.size()>0) { -// List list = new ArrayList(); +// List list = new ArrayList(); // for (String p : add) { // if(oConvertUtils.isNotEmpty(p)) { -// NuAppEmployessPermission rolepms = new NuAppEmployessPermission(roleId, p); +// NuAppEmployeesPermission rolepms = new NuAppEmployeesPermission(roleId, p); // rolepms.setOperateDate(new Date()); // rolepms.setOperateIp(ip); // list.add(rolepms); @@ -67,14 +66,14 @@ public class NuAppEmployessPermissionServiceImpl extends ServiceImpl delete = getDiff(permissionIds,lastPermissionIds,nuId); // if(delete!=null && delete.size()>0) { // for (String permissionId : delete) { -// this.remove(new QueryWrapper().lambda().eq(NuAppEmployessPermission::getRoleId, roleId).eq(NuAppEmployessPermission::getPermissionId, permissionId).eq(NuAppEmployessPermission::getNuId, nuId)); +// this.remove(new QueryWrapper().lambda().eq(NuAppEmployeesPermission::getRoleId, roleId).eq(NuAppEmployeesPermission::getPermissionId, permissionId).eq(NuAppEmployeesPermission::getNuId, nuId)); // } // } } @Override - public List listByEmployessId(String employessId) { - return baseMapper.listByEmployessId(employessId); + public List listByEmployeesId(String employeesId) { + return baseMapper.listByEmployeesId(employeesId); } /** diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/controller/NuEmployeesAdvisoryInfoController.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/controller/NuEmployeesAdvisoryInfoController.java similarity index 98% rename from nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/controller/NuEmployeesAdvisoryInfoController.java rename to nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/controller/NuEmployeesAdvisoryInfoController.java index 21287dd5..f871addb 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/controller/NuEmployeesAdvisoryInfoController.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/controller/NuEmployeesAdvisoryInfoController.java @@ -1,4 +1,4 @@ -package com.nu.modules.employessadvisiory.controller; +package com.nu.modules.employeesadvisiory.controller; import java.util.*; import java.util.stream.Collectors; @@ -14,8 +14,8 @@ import com.nu.modules.employeesmedia.entity.BizEmployeesMedia; import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import com.nu.modules.employessadvisiory.entity.NuEmployeesAdvisoryInfo; -import com.nu.modules.employessadvisiory.service.INuEmployeesAdvisoryInfoService; +import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo; +import com.nu.modules.employeesadvisiory.service.INuEmployeesAdvisoryInfoService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/entity/NuEmployeesAdvisoryInfo.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/entity/NuEmployeesAdvisoryInfo.java similarity index 99% rename from nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/entity/NuEmployeesAdvisoryInfo.java rename to nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/entity/NuEmployeesAdvisoryInfo.java index 09fea17e..8c9c23cc 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/entity/NuEmployeesAdvisoryInfo.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/entity/NuEmployeesAdvisoryInfo.java @@ -1,4 +1,4 @@ -package com.nu.modules.employessadvisiory.entity; +package com.nu.modules.employeesadvisiory.entity; import java.io.Serializable; diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/mapper/NuEmployeesAdvisoryInfoMapper.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/mapper/NuEmployeesAdvisoryInfoMapper.java similarity index 70% rename from nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/mapper/NuEmployeesAdvisoryInfoMapper.java rename to nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/mapper/NuEmployeesAdvisoryInfoMapper.java index 9ac269fe..1422f9d1 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/mapper/NuEmployeesAdvisoryInfoMapper.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/mapper/NuEmployeesAdvisoryInfoMapper.java @@ -1,7 +1,7 @@ -package com.nu.modules.employessadvisiory.mapper; +package com.nu.modules.employeesadvisiory.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.employessadvisiory.entity.NuEmployeesAdvisoryInfo; +import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo; /** * @Description: 员工咨询信息 diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml similarity index 74% rename from nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml rename to nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml index aa081e85..2bdf9b10 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/service/INuEmployeesAdvisoryInfoService.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/service/INuEmployeesAdvisoryInfoService.java similarity index 75% rename from nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/service/INuEmployeesAdvisoryInfoService.java rename to nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/service/INuEmployeesAdvisoryInfoService.java index 8c5afdd4..60818c12 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/service/INuEmployeesAdvisoryInfoService.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/service/INuEmployeesAdvisoryInfoService.java @@ -1,6 +1,6 @@ -package com.nu.modules.employessadvisiory.service; +package com.nu.modules.employeesadvisiory.service; -import com.nu.modules.employessadvisiory.entity.NuEmployeesAdvisoryInfo; +import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java similarity index 96% rename from nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java rename to nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index 49504cd0..2172bfe5 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesadvisiory/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -1,12 +1,12 @@ -package com.nu.modules.employessadvisiory.service.impl; +package com.nu.modules.employeesadvisiory.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.employeesmedia.entity.BizEmployeesMedia; import com.nu.modules.employeesmedia.service.IBizEmployeesMediaService; -import com.nu.modules.employessadvisiory.entity.NuEmployeesAdvisoryInfo; -import com.nu.modules.employessadvisiory.mapper.NuEmployeesAdvisoryInfoMapper; -import com.nu.modules.employessadvisiory.service.INuEmployeesAdvisoryInfoService; +import com.nu.modules.employeesadvisiory.entity.NuEmployeesAdvisoryInfo; +import com.nu.modules.employeesadvisiory.mapper.NuEmployeesAdvisoryInfoMapper; +import com.nu.modules.employeesadvisiory.service.INuEmployeesAdvisoryInfoService; import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog; import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService; import com.nu.modules.sysconfig.ISysConfigApi; diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/mapper/NuAppEmployessPermissionMapper.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/mapper/NuAppEmployessPermissionMapper.java deleted file mode 100644 index 8e4d49a2..00000000 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/mapper/NuAppEmployessPermissionMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.employessPermission.mapper; - -import java.util.List; - -import com.nu.modules.nuidPermission.entity.NuAppNuidPermission; -import org.apache.ibatis.annotations.Param; -import com.nu.modules.employessPermission.entity.NuAppEmployessPermission; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: nu_app_employess_permission - * @Author: jeecg-boot - * @Date: 2026-01-04 - * @Version: V1.0 - */ -public interface NuAppEmployessPermissionMapper extends BaseMapper { - - List listByEmployessId(@Param("roleId") String employessId); -} diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/service/INuAppEmployessPermissionService.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/service/INuAppEmployessPermissionService.java deleted file mode 100644 index 9d27bf2d..00000000 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/service/INuAppEmployessPermissionService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nu.modules.employessPermission.service; - -import com.nu.modules.employessPermission.entity.NuAppEmployessPermission; -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.nuidPermission.entity.NuAppNuidPermission; - -import java.util.List; - -/** - * @Description: nu_app_employess_permission - * @Author: jeecg-boot - * @Date: 2026-01-04 - * @Version: V1.0 - */ -public interface INuAppEmployessPermissionService extends IService { - - void saveRolePermission(String roleId, String permissionIds, String lastPermissionIds,String nuId); - - List listByEmployessId(String employessId); -} 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 51448ee9..869773c2 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 @@ -1414,7 +1414,7 @@ public class EmployeesMQListener { // user.setStatus(1); // user.setDelFlag(CommonConstant.DEL_FLAG_0); // user.setCreateTime(new Date());//设置创建时间 -// user.setEmployessId(employeeId); +// user.setEmployeesId(employeeId); // sysUserAPI.save(user); //审核通过 - 给员工添加账号 @@ -1425,7 +1425,7 @@ public class EmployeesMQListener { j.put("orgCode",deptInfo.getString("id"));//这个参数要的是机构的id j.put("opeType","employee"); j.put("o_c_",deptInfo.getString("code")); - j.put("employess_id",employeeId); + j.put("employees_id",employeeId); employeesApplyService.initialization(j); }else{ user.setUsername(employeesInfo.getTel()); @@ -1470,7 +1470,7 @@ public class EmployeesMQListener { user.setStatus(1); user.setDelFlag(CommonConstant.DEL_FLAG_0); user.setCreateTime(new Date());//设置创建时间 - user.setEmployessId(employeeId); + user.setEmployeesId(employeeId); sysUserAPI.save(user); }else{ user.setUsername(dto.getUsername()); @@ -1495,7 +1495,7 @@ public class EmployeesMQListener { if(user!=null){ SysUserMQDto sysUserMQDto = new SysUserMQDto(); BeanUtils.copyProperties(user, sysUserMQDto); - sysUserMQDto.setEmployeeId(user.getEmployessId()); + sysUserMQDto.setEmployeeId(user.getEmployeesId()); rabbitMQUtil.sendToExchange("hldy.employees", "hldy.employeesorg.sysuser.sync", sysUserMQDto); } }else{ @@ -1546,13 +1546,13 @@ public class EmployeesMQListener { public void handleSysUserInfo(SysUserMQDto dto) { // String employeeId = dto.getEmployeeId(); // QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.eq("employess_id", employeeId); +// queryWrapper.eq("employees_id", employeeId); SysUserEntity user = sysUserAPI.getOne(dto.getEmployeeId()); if(user!=null) { SysUserMQDto sysUserMQDto = new SysUserMQDto(); BeanUtils.copyProperties(user, sysUserMQDto); sysUserMQDto.setTargetOrgCode(dto.getTargetOrgCode()); - sysUserMQDto.setEmployeeId(user.getEmployessId()); + sysUserMQDto.setEmployeeId(user.getEmployeesId()); rabbitMQUtil.sendToExchange("hldy.employees", "hldy.employeesorg.sysuser.info", sysUserMQDto); } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java index c8c4ca26..189a8448 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java @@ -390,7 +390,7 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl result = invoicingOrdersApi.beginOrder(orderEntity); // return result; // } @@ -406,7 +406,7 @@ public class NuInvoicingPddMainServiceImpl extends ServiceImpl page = new Page(pageNo, pageSize); - IPage pageList = nuBaseInfoService.qyPemissionList(page, queryWrapper, nuBaseInfo.getEmployessId()); + IPage pageList = nuBaseInfoService.qyPemissionList(page, queryWrapper, nuBaseInfo.getEmployeesId()); return Result.OK(pageList); } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java index c53e2e33..23a22c73 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java @@ -185,7 +185,7 @@ public class NuBaseInfo implements Serializable { private String permissionIds; //护理员id @TableField(exist = false) - private String employessId; + private String employeesId; @TableField(exist = false) private String type; @TableField(exist = false) diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/NuBaseInfoMapper.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/NuBaseInfoMapper.java index 7027f41f..7ffab7ed 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/NuBaseInfoMapper.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/NuBaseInfoMapper.java @@ -31,7 +31,7 @@ public interface NuBaseInfoMapper extends BaseMapper { List queryNuAndCameraInfo(@Param("dto") NuBaseInfoEntity dto); - List getPermissionList(@Param("employessId") String employessId); + List getPermissionList(@Param("employeesId") String employeesId); - List queryReadList(@Param("employessId") String employessId,@Param("username") String username); + List queryReadList(@Param("employeesId") String employeesId,@Param("username") String username); } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml index c7ff02b5..19d71393 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml @@ -77,18 +77,18 @@ diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/INuBaseInfoService.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/INuBaseInfoService.java index bf84f92a..42112f34 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/INuBaseInfoService.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/INuBaseInfoService.java @@ -24,5 +24,5 @@ public interface INuBaseInfoService extends IService { IPage qyList(Page page, QueryWrapper queryWrapper); - IPage qyPemissionList(Page page, QueryWrapper queryWrapper,String employessId); + IPage qyPemissionList(Page page, QueryWrapper queryWrapper,String employeesId); } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java index 23dd27cb..d910bf44 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -114,10 +114,10 @@ public class NuBaseInfoServiceImpl extends ServiceImpl qyPemissionList(Page page, QueryWrapper queryWrapper,String employessId) { + public IPage qyPemissionList(Page page, QueryWrapper queryWrapper,String employeesId) { IPage listPage = baseMapper.qyList(page, queryWrapper); - List perList = baseMapper.getPermissionList(employessId); + List perList = baseMapper.getPermissionList(employeesId); listPage.getRecords().forEach(nuBaseInfo -> { perList.forEach(per -> { @@ -174,10 +174,10 @@ public class NuBaseInfoServiceImpl extends ServiceImpl readList = baseMapper.queryReadList(loginUser.getEmployessId(), loginUser.getUsername()); + List readList = baseMapper.queryReadList(loginUser.getEmployeesId(), loginUser.getUsername()); //查找list集合里的nuid等于cameraList集合中nuid的就给list集合赋值 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java index a452f9b0..a153c39f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java @@ -277,7 +277,7 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl addBizLog(DirectiveOrderBizLogEntity directiveOrderBizLogEntity) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - directiveOrderBizLogEntity.setOptEmpId(sysUser.getEmployessId()); + directiveOrderBizLogEntity.setOptEmpId(sysUser.getEmployeesId()); directiveOrderBizLogEntity.setOptTime(new Date()); DirectiveOrderBizLog directiveOrderBizLog = new DirectiveOrderBizLog(); BeanUtils.copyProperties(directiveOrderBizLogEntity, directiveOrderBizLog); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java index cecd6257..d2cddce2 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java @@ -821,7 +821,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl> getEmployessServiceTags(ServiceTag serviceTag) { + @GetMapping(value = "/getEmployeesServiceTags") + public Result> getEmployeesServiceTags(ServiceTag serviceTag) { if(StringUtils.isEmpty(serviceTag.getEmployeesId())){ return Result.error("员工id不能为空"); } - List pageList = serviceTagService.getEmployessServiceTags(serviceTag); + List pageList = serviceTagService.getEmployeesServiceTags(serviceTag); return Result.OK(pageList); } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java index dfcc8fdf..7baca40c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java @@ -26,5 +26,5 @@ public interface ServiceTagMapper extends BaseMapper { IPage getEmployeesList(Page page, ServiceTag serviceTag); - List getEmployessServiceTags(ServiceTag serviceTag); + List getEmployeesServiceTags(ServiceTag serviceTag); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml index 4f0d249a..7abdbaf1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml @@ -201,7 +201,7 @@ - select a.id, b.tag_name, b.description, a.create_time, b.id as employeesTagsId from nu_biz_employees_servcie_tags a LEFT JOIN nu_service_tag b on a.tags_id = b.id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java index 4672e8ee..df649a37 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java @@ -27,5 +27,5 @@ public interface IServiceTagService extends IService { IPage getEmployeesList(Page page, ServiceTag queryWrapper); - List getEmployessServiceTags(ServiceTag serviceTag); + List getEmployeesServiceTags(ServiceTag serviceTag); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java index 5316eec4..19c87f76 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java @@ -68,8 +68,8 @@ public class ServiceTagServiceImpl extends ServiceImpl getEmployessServiceTags(ServiceTag serviceTag) { - return baseMapper.getEmployessServiceTags(serviceTag); + public List getEmployeesServiceTags(ServiceTag serviceTag) { + return baseMapper.getEmployeesServiceTags(serviceTag); } } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index 8d98a1d8..bbda9c94 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -144,7 +144,7 @@ public class LoginController { JSONObject deptInfo = sysBaseAPI.getDeptInfo(); String orgCode = deptInfo.getString("code"); SysUserMQDto dto = new SysUserMQDto(); - dto.setEmployeeId(sysUser.getEmployessId()); + dto.setEmployeeId(sysUser.getEmployeesId()); dto.setOrgCode(orgCode); rabbitMQUtil.sendToExchange("hldy.employees", "hldy.employeesorg.lastlogin", dto); diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 6259c812..05c554a3 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -300,11 +300,11 @@ public class SysUserController { @RequiresPermissions("system:user:queryById") - @RequestMapping(value = "/queryByEmployessId", method = RequestMethod.GET) - public Result queryByEmployessId(@RequestParam(name = "employessId", required = true) String employessId) { + @RequestMapping(value = "/queryByEmployeesId", method = RequestMethod.GET) + public Result queryByEmployeesId(@RequestParam(name = "employeesId", required = true) String employeesId) { Result result = new Result(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("employess_id", employessId); + queryWrapper.eq("employees_id", employeesId); SysUser sysUser = sysUserService.getOne(queryWrapper); result.setResult(sysUser); result.setSuccess(true); @@ -1749,7 +1749,7 @@ public class SysUserController { sysUserService.updateById(sysUserEditAvatar); //修改员工表头像 - employeesInfoApi.upHeadPath(sysUser.getEmployessId(),sysUser.getAvatar()); + employeesInfoApi.upHeadPath(sysUser.getEmployeesId(),sysUser.getAvatar()); return Result.ok("更新个人信息成功"); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java index 700d7ef5..06dc5bb3 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java @@ -170,7 +170,7 @@ public class SysUser implements Serializable { /** * 员工id */ - private String employessId; + private String employeesId; @Dict(dicCode = "login_type") private String loginType; diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserApiImpl.java index d02993a5..b14a9f21 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserApiImpl.java @@ -108,7 +108,7 @@ public class SysUserApiImpl implements ISysUserAPI { @Override public SysUserEntity getOne(String employeeId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("employess_id", employeeId); + queryWrapper.eq("employees_id", employeeId); SysUser user = service.getOne(queryWrapper); SysUserEntity sysUserEntity = new SysUserEntity(); if (user != null) { @@ -206,7 +206,7 @@ public class SysUserApiImpl implements ISysUserAPI { @Override public List queryByEmployees(String employeeIds) { QueryWrapper qw = new QueryWrapper<>(); - qw.in("employess_id",employeeIds.split(",")); + qw.in("employees_id",employeeIds.split(",")); List list = sysUserService.list(qw); return BeanUtil.copyToList(list,SysUserEntity.class); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 9a4f76a4..39a90ac1 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -2115,7 +2115,7 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override public void modifyEmpOnline(SysUser sysUser, String izOnline){ - String employeeId = sysUser.getEmployessId(); + String employeeId = sysUser.getEmployeesId(); if(employeeId!=null&&!employeeId.equals("")){ userMapper.modifyEmpOnline(employeeId,izOnline); }