yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改名：employess改为employees，包括类名，页面名，接口名，参数名

This commit is contained in:
曹磊 2026-02-03 10:24:23 +08:00
parent b7f86786ed
commit a7f115b13b
14 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/EmployeesOrgLocalApi.java → nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployeesInfo/api/EmployeesOrgLocalApi.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.EmployessInfo.api;
package com.nu.modules.EmployeesInfo.api;
import com.nu.entity.EmployeesApplyEntity;
import com.nu.entity.EmployeesOrgApiEntity;

8
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployessInfo/api/IEmployessAdvisioryInfoApi.java → nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/EmployeesInfo/api/IEmployeesAdvisioryInfoApi.java
View File

@ -1,15 +1,15 @@
package com.nu.modules.EmployessInfo.api;
package com.nu.modules.EmployeesInfo.api;
import cn.hutool.json.JSONObject;
import com.nu.entity.EmployeesAdvisoryInfoEntity;
import java.util.List;
public interface IEmployessAdvisioryInfoApi {
public interface IEmployeesAdvisioryInfoApi {
EmployeesAdvisoryInfoEntity insert(EmployeesAdvisoryInfoEntity eployeesAdvisoryInfoEntity);
EmployeesAdvisoryInfoEntity insert(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity);
int updateById(EmployeesAdvisoryInfoEntity eployeesAdvisoryInfoEntity);
int updateById(EmployeesAdvisoryInfoEntity employeesAdvisoryInfoEntity);
List<EmployeesAdvisoryInfoEntity> queryAuditInfo(String openId, String orgCode);

8
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java
View File

@ -9,15 +9,13 @@ import com.nu.entity.EmployeesAdvisoryInfoEntity;
import com.nu.entity.SuppliersApplyEntity;
import com.nu.entity.SuppliersOrgAllEntity;
import com.nu.entity.SuppliersOrgEntity;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.modules.EmployeesInfo.api.IEmployeesAdvisioryInfoApi;
import com.nu.modules.bizSuppliers.entity.NuBizSuppliersApply;
import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg;
import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersApplyMapper;
import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersOrgMapper;
import com.nu.modules.bizSuppliers.service.INuBizSuppliersApplyService;
import com.nu.modules.bizSuppliers.service.INuBizSuppliersOrgService;
import com.nu.modules.orgapplyinfo.entity.OrgAllInfo;
import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity;
import com.nu.modules.suppliers.ISuppliersApi;
import com.nu.utils.RabbitMQUtil;
import org.apache.commons.lang.StringUtils;
@ -43,7 +41,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
private NuBizSuppliersOrgMapper nuBizSuppliersOrgMapper;
@Autowired
private IEmployessAdvisioryInfoApi employessAdvisioryInfoApi;
private IEmployeesAdvisioryInfoApi employeesAdvisioryInfoApi;
@Autowired
private INuBizSuppliersOrgService suppliersOrgService;
@ -77,7 +75,7 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
EmployeesAdvisoryInfoEntity edEntity = new EmployeesAdvisoryInfoEntity();
edEntity.setOpenId(suppliersApplyEntity.getOpenId());
edEntity.setIzGys("Y");
employessAdvisioryInfoApi.updateByOpenId(edEntity);
employeesAdvisioryInfoApi.updateByOpenId(edEntity);
BeanUtils.copyProperties(nuBizSuppliersApply, suppliersApplyEntity);

2
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java
View File

@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.nu.entity.EmployeesApplyEntity;
import com.nu.modules.EmployessInfo.api.EmployeesOrgLocalApi;
import com.nu.modules.EmployeesInfo.api.EmployeesOrgLocalApi;
import com.nu.entity.EmployeesOrgApiEntity;
import com.nu.modules.employees.entity.EmployeesOrg;
import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;

5
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
View File

@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.dto.EmployeesApplyMQDto;
import com.nu.dto.EmployeesStatusMQDto;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.modules.EmployeesInfo.api.IEmployeesAdvisioryInfoApi;
import com.nu.entity.EmployeesAdvisoryInfoEntity;
import com.nu.modules.employees.entity.EmployeesOrg;
import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.employees.mapper.NuEmployeesAdvisoryInfoMapper;
import com.nu.modules.employees.service.IEmployeesOrgService;
import com.nu.modules.employees.service.INuEmployeesAdvisoryInfoService;
import com.nu.modules.orgapplyinfo.entity.OrgApplyInfo;
import com.nu.modules.weixin.utils.TemplateMessageSender;
import com.nu.modules.weixin.utils.WechatMiniProgramUtils;
import com.nu.utils.RabbitMQUtil;
@ -41,7 +40,7 @@ import java.util.stream.Collectors;
* @Version: V1.0
*/
@Service
public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesAdvisoryInfoMapper, NuEmployeesAdvisoryInfo> implements INuEmployeesAdvisoryInfoService, IEmployessAdvisioryInfoApi {
public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesAdvisoryInfoMapper, NuEmployeesAdvisoryInfo> implements INuEmployeesAdvisoryInfoService, IEmployeesAdvisioryInfoApi {
@Autowired
private BaseCommonService baseCommonService;

6
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/service/impl/OrgApplyInfoServiceImpl.java
View File

@ -12,7 +12,7 @@ import com.nu.entity.EmployeesAdvisoryInfoEntity;
import com.nu.entity.NuWxNoticeEntity;
import com.nu.entity.WxNoticeEntity;
import com.nu.enums.WxClientType;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.modules.EmployeesInfo.api.IEmployeesAdvisioryInfoApi;
import com.nu.modules.orgapplyinfo.api.IOrgApplyInfoApi;
import com.nu.modules.orgapplyinfo.entity.OrgAllInfo;
import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity;
@ -55,7 +55,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
private IWxNoticeApi wxNoticeApi;
@Autowired
private IEmployessAdvisioryInfoApi employessAdvisioryInfoApi;
private IEmployeesAdvisioryInfoApi employeesAdvisioryInfoApi;
@Override
public OrgApplyInfoApiEntity insert(OrgApplyInfoApiEntity orgApplyInfoApiEntity) {
@ -275,7 +275,7 @@ public class OrgApplyInfoServiceImpl extends ServiceImpl<OrgApplyInfoMapper, Org
EmployeesAdvisoryInfoEntity edEntity = new EmployeesAdvisoryInfoEntity();
edEntity.setOpenId(orgApplyInfo.getOpenId());
edEntity.setIzJg("Y");
employessAdvisioryInfoApi.updateByOpenId(edEntity);
employeesAdvisioryInfoApi.updateByOpenId(edEntity);
//发送小程序、微信通知
NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity();

6
nursing-unit-api/src/main/java/com/nu/modules/pad/api/PadLoginApi.java
View File

@ -1,9 +1,7 @@
package com.nu.modules.pad.api;
import cn.hutool.json.JSONObject;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.modules.advisoryinfo.api.IAdvisoryInfoApi;
import com.nu.modules.advisoryinfo.entity.AdvisoryInfoEntity;
import com.nu.modules.EmployeesInfo.api.IEmployeesAdvisioryInfoApi;
import org.jeecg.common.api.vo.Result;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -18,7 +16,7 @@ public class PadLoginApi {
/* @Autowired
private IAdvisoryInfoApi advisoryInfoApi; */
@Autowired
private IEmployessAdvisioryInfoApi service;
private IEmployeesAdvisioryInfoApi service;
/**
* 根据电话号获取信息

11
nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessApplyApi.java → nursing-unit-api/src/main/java/com/nu/modules/wechat/employees/api/EmployeesApplyApi.java
View File

@ -1,11 +1,10 @@
package com.nu.modules.wechat.employess.api;
package com.nu.modules.wechat.employees.api;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.Maps;
import com.nu.dto.EmployeesApplyMQDto;
import com.nu.dto.SysUserMQDto;
import com.nu.entity.EmployeesApplyEntity;
import com.nu.modules.EmployessInfo.api.EmployeesOrgLocalApi;
import com.nu.modules.EmployeesInfo.api.EmployeesOrgLocalApi;
import com.nu.entity.EmployeesOrgApiEntity;
import com.nu.modules.orgapplyinfo.api.IOrgApplyInfoApi;
import com.nu.modules.orgapplyinfo.entity.EmployeesApiEntity;
@ -23,8 +22,8 @@ import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/api/employessapply")
public class EmployessApplyApi {
@RequestMapping("/api/employeesapply")
public class EmployeesApplyApi {
@Autowired
private RabbitMQUtil rabbitMQUtil;
@ -41,7 +40,7 @@ public class EmployessApplyApi {
*/
@AutoLog(value = "员工申请-加入机构申请")
@PostMapping("/apply")
public Result<Object> saveApiEmployess(@RequestBody EmployeesApplyEntity dto) {
public Result<Object> saveApiEmployees(@RequestBody EmployeesApplyEntity dto) {
if (StringUtils.isBlank(dto.getOrgCode())) {
return Result.error("申请失败");
}

28
nursing-unit-api/src/main/java/com/nu/modules/wechat/employess/api/EmployessInfoApi.java → nursing-unit-api/src/main/java/com/nu/modules/wechat/employees/api/EmployeesInfoApi.java
View File

@ -1,7 +1,7 @@
package com.nu.modules.wechat.employess.api;
package com.nu.modules.wechat.employees.api;
import com.nu.entity.EmployeesAdvisoryInfoEntity;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.modules.EmployeesInfo.api.IEmployeesAdvisioryInfoApi;
import com.nu.utils.NuRedisUtils;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/api/employessAdvisiory")
public class EmployessInfoApi {
@RequestMapping("/api/employeesAdvisiory")
public class EmployeesInfoApi {
@Autowired
private IEmployessAdvisioryInfoApi employessAdvisioryInfoApi;
private IEmployeesAdvisioryInfoApi employeesAdvisioryInfoApi;
/**
@ -27,10 +27,10 @@ public class EmployessInfoApi {
* @return
*/
@AutoLog(value = "员工咨询信息-新增或修改")
@PostMapping("/saveApiEmployess")
public Result<Object> saveApiEmployess(@RequestParam("ukey") String ukey, @RequestBody EmployeesAdvisoryInfoEntity EmployeesAdvisoryInfoEntity) {
@PostMapping("/saveApiEmployees")
public Result<Object> saveApiEmployees(@RequestParam("ukey") String ukey, @RequestBody EmployeesAdvisoryInfoEntity EmployeesAdvisoryInfoEntity) {
if (StringUtils.isNotBlank(EmployeesAdvisoryInfoEntity.getId())) {
if(!employessAdvisioryInfoApi.validateChanged(EmployeesAdvisoryInfoEntity)){
if(!employeesAdvisioryInfoApi.validateChanged(EmployeesAdvisoryInfoEntity)){
return Result.ok("未做变更");
}
}
@ -43,14 +43,14 @@ public class EmployessInfoApi {
// employeesAdvisoryInfoEntity.setOpenId(EmployeesAdvisoryInfoEntity.getOpenId());
// employeesAdvisoryInfoEntity.setAdvisoryType("2");
// employeesAdvisoryInfoEntity.setIzYg("1");
// employessAdvisioryInfoApi.updateByOpenId(employeesAdvisoryInfoEntity);
// employeesAdvisioryInfoApi.updateByOpenId(employeesAdvisoryInfoEntity);
// }
System.out.println("-----------新增/编辑员工入驻申请信息--------getId------------" + EmployeesAdvisoryInfoEntity.getId());
if (StringUtils.isNotBlank(EmployeesAdvisoryInfoEntity.getId())) {
employessAdvisioryInfoApi.updateById(EmployeesAdvisoryInfoEntity);
employeesAdvisioryInfoApi.updateById(EmployeesAdvisoryInfoEntity);
return Result.ok("保存成功！");
} else {
Result.ok(employessAdvisioryInfoApi.insert(EmployeesAdvisoryInfoEntity));
Result.ok(employeesAdvisioryInfoApi.insert(EmployeesAdvisoryInfoEntity));
return Result.ok("添加成功！");
}
}
@ -61,12 +61,12 @@ public class EmployessInfoApi {
* @param openId
* @return
*/
@GetMapping("/queryApiEmployessInfo")
public Result<List<EmployeesAdvisoryInfoEntity>> queryApiEmployessInfo(@RequestParam("openId") String openId,
@GetMapping("/queryApiEmployeesInfo")
public Result<List<EmployeesAdvisoryInfoEntity>> queryApiEmployeesInfo(@RequestParam("openId") String openId,
@RequestParam(value = "orgCode", required = false) String orgCode) {
if (StringUtils.isBlank(openId)) {
return Result.error("手机号码错误");
}
return Result.ok(employessAdvisioryInfoApi.queryAuditInfo(openId, orgCode));
return Result.ok(employeesAdvisioryInfoApi.queryAuditInfo(openId, orgCode));
}
}

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java
View File

@ -204,12 +204,12 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
}
@GetMapping(value = "/getEmployessServiceTags")
public Result<List<ServiceTag>> getEmployessServiceTags(ServiceTag serviceTag) {
@GetMapping(value = "/getEmployeesServiceTags")
public Result<List<ServiceTag>> getEmployeesServiceTags(ServiceTag serviceTag) {
if(StringUtils.isEmpty(serviceTag.getEmployeesId())){
return Result.error("员工id不能为空");
}
List<ServiceTag> pageList = serviceTagService.getEmployessServiceTags(serviceTag);
List<ServiceTag> pageList = serviceTagService.getEmployeesServiceTags(serviceTag);
return Result.OK(pageList);
}
}

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/ServiceTagMapper.java
View File

@ -28,5 +28,5 @@ public interface ServiceTagMapper extends BaseMapper<ServiceTag> {
IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag serviceTag);
List<ServiceTag> getEmployessServiceTags(ServiceTag serviceTag);
List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag);
}

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml
View File

@ -197,7 +197,7 @@
</select>
<select id="getEmployessServiceTags" resultType="com.nu.modules.servicetag.entity.ServiceTag">
<select id="getEmployeesServiceTags" resultType="com.nu.modules.servicetag.entity.ServiceTag">
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

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/IServiceTagService.java
View File

@ -28,5 +28,5 @@ public interface IServiceTagService extends IService<ServiceTag> {
IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag queryWrapper);
List<ServiceTag> getEmployessServiceTags(ServiceTag serviceTag);
List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag);
}

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java
View File

@ -68,8 +68,8 @@ public class ServiceTagServiceImpl extends ServiceImpl<ServiceTagMapper, Service
}
@Override
public List<ServiceTag> getEmployessServiceTags(ServiceTag serviceTag) {
return baseMapper.getEmployessServiceTags(serviceTag);
public List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag) {
return baseMapper.getEmployeesServiceTags(serviceTag);
}
}