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

删除多余代码： 

1、员工相关
This commit is contained in:
1378012178@qq.com 2026-05-07 15:49:36 +08:00
parent b6fdc7d5d4
commit 6e247e680c
20 changed files with 0 additions and 1180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java
View File

@ -51,10 +51,6 @@ public class ElderInfoMQDto implements Serializable {
* 性别
*/
private String sex;
/**
* 年龄
*/
private String age;
/**
* 身份证号码
*/
@ -92,26 +88,6 @@ public class ElderInfoMQDto implements Serializable {
* 长者缴费状态 字典elder_payment_status
*/
private String paymentStatus;
/**
* 报销类型
*/
private String reimbType;
/**
* 医保卡号
*/
private String medicalCard;
/**
* 文化程度
*/
private String educationLevel;
/**
* 婚姻状况
*/
private String maritalStatus;
/**
* 宗教信仰
*/
private String religiousBeliefs;
/**
* 身份证正面
*/
@ -120,18 +96,6 @@ public class ElderInfoMQDto implements Serializable {
* 身份证反面
*/
private String idCardNegative;
/**
* 户口本本人页
*/
private String accountBookHimself;
/**
* 医保卡正面
*/
private String frontMedical;
/**
* 医保卡反面
*/
private String negaticeMedical;
/**
* 备注
*/
@ -243,14 +207,6 @@ public class ElderInfoMQDto implements Serializable {
* 发卡日期
*/
private Date cardIssuing;
/**
* 血型
*/
private String bloodType;
/**
* 兵役状况
*/
private String militaryType;
/**
* 机构编码

2
nursing-unit-common/src/main/java/com/nu/dto/EmployeesStatusMQDto.java
View File

@ -59,8 +59,6 @@ public class EmployeesStatusMQDto implements Serializable {
private String cardZmPath;
/**身份证反面*/
private String cardFmPath;
/**婚否（0未婚 1已婚）*/
private String maritalStatus;
/**身高*/
private String height;
/**体重*/

3
nursing-unit-common/src/main/java/com/nu/entity/AdvisoryInfoEntity.java
View File

@ -60,8 +60,6 @@ public class AdvisoryInfoEntity implements Serializable {
private String medicalInsuranceType;
/**老人性别*/
private String oldManSex;
/**报销类型*/
private String reimbType;
/**护理单元*/
private String nuId;
/**是否入住0否 1是(是否入住过）*/
@ -78,7 +76,6 @@ public class AdvisoryInfoEntity implements Serializable {
private String oldManSexName;
private String medicalInsuranceTypeName;
private String reimbTypeName;
private String token;
}

44
nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java
View File

@ -34,10 +34,6 @@ public class ElderInfoEntity implements Serializable {
* 性别
*/
private String sex;
/**
* 年龄
*/
private String age;
/**
* 身份证号码
*/
@ -75,26 +71,6 @@ public class ElderInfoEntity implements Serializable {
* 长者缴费状态 字典elder_payment_status
*/
private String paymentStatus;
/**
* 报销类型
*/
private String reimbType;
/**
* 医保卡号
*/
private String medicalCard;
/**
* 文化程度
*/
private String educationLevel;
/**
* 婚姻状况
*/
private String maritalStatus;
/**
* 宗教信仰
*/
private String religiousBeliefs;
/**
* 身份证正面
*/
@ -103,18 +79,6 @@ public class ElderInfoEntity implements Serializable {
* 身份证反面
*/
private String idCardNegative;
/**
* 户口本本人页
*/
private String accountBookHimself;
/**
* 医保卡正面
*/
private String frontMedical;
/**
* 医保卡反面
*/
private String negaticeMedical;
/**
* 备注
*/
@ -210,14 +174,6 @@ public class ElderInfoEntity implements Serializable {
* 发卡日期
*/
private java.util.Date cardIssuing;
/**
* 血型
*/
private String bloodType;
/**
* 兵役状况
*/
private String militaryType;
/**
* 监护人信息变更状态 1修改申请中 2通过 3驳回
*/

61
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java
View File

@ -54,12 +54,6 @@ public class ElderInfo implements Serializable {
@ApiModelProperty(value = "性别")
@Dict(dicCode = "sex")
private java.lang.String sex;
/**
* 年龄
*/
@Excel(name = "年龄", width = 15)
@ApiModelProperty(value = "年龄")
private java.lang.String age;
/**
* 身份证号码
*/
@ -114,35 +108,6 @@ public class ElderInfo implements Serializable {
@Dict(dicCode = "elder_payment_status")
@ApiModelProperty(value = "长者缴费状态")
private String paymentStatus;
/**
* 报销类型
*/
@Dict(dicCode = "reimb_type")
private java.lang.String reimbType;
/**
* 医保卡号
*/
@Excel(name = "医保卡号", width = 15)
@ApiModelProperty(value = "医保卡号")
private java.lang.String medicalCard;
/**
* 文化程度
*/
@Excel(name = "文化程度", width = 15)
@ApiModelProperty(value = "文化程度")
private java.lang.String educationLevel;
/**
* 婚姻状况
*/
@Excel(name = "婚姻状况", width = 15)
@ApiModelProperty(value = "婚姻状况")
private java.lang.String maritalStatus;
/**
* 宗教信仰
*/
@Excel(name = "宗教信仰", width = 15)
@ApiModelProperty(value = "宗教信仰")
private java.lang.String religiousBeliefs;
/**
* 身份证正面
*/
@ -155,24 +120,6 @@ public class ElderInfo implements Serializable {
@Excel(name = "身份证反面", width = 15)
@ApiModelProperty(value = "身份证反面")
private java.lang.String idCardNegative;
/**
* 户口本本人页
*/
@Excel(name = "户口本本人页", width = 15)
@ApiModelProperty(value = "户口本本人页")
private java.lang.String accountBookHimself;
/**
* 医保卡正面
*/
@Excel(name = "医保卡正面", width = 15)
@ApiModelProperty(value = "医保卡正面")
private java.lang.String frontMedical;
/**
* 医保卡反面
*/
@Excel(name = "医保卡反面", width = 15)
@ApiModelProperty(value = "医保卡反面")
private java.lang.String negaticeMedical;
/**
* 备注
*/
@ -314,14 +261,6 @@ public class ElderInfo implements Serializable {
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date cardIssuing;
/**
* 血型
*/
private java.lang.String bloodType;
/**
* 兵役状况
*/
private java.lang.String militaryType;
/**
* 监护人信息变更状态 1修改申请中 2通过 3驳回

72
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/entity/ElderModifyInfo.java
View File

@ -62,12 +62,6 @@ public class ElderModifyInfo implements Serializable {
@Excel(name = "性别", width = 15)
@ApiModelProperty(value = "性别")
private String sex;
/**
* 年龄
*/
@Excel(name = "年龄", width = 15)
@ApiModelProperty(value = "年龄")
private String age;
/**
* 身份证号码
*/
@ -94,24 +88,12 @@ public class ElderModifyInfo implements Serializable {
@Excel(name = "户籍所在地", width = 15)
@ApiModelProperty(value = "户籍所在地")
private String houseAddress;
/**
* 自理程度
*/
@Excel(name = "自理程度", width = 15)
@ApiModelProperty(value = "自理程度")
private String selfCareType;
/**
* 头像
*/
@Excel(name = "头像", width = 15)
@ApiModelProperty(value = "头像")
private String avatarPath;
/**
* 报销类型
*/
@Excel(name = "报销类型", width = 15)
@ApiModelProperty(value = "报销类型")
private String reimbType;
/**
* 医保类型
*/
@ -134,30 +116,6 @@ public class ElderModifyInfo implements Serializable {
@Dict(dicCode = "elder_payment_status")
@ApiModelProperty(value = "长者缴费状态")
private String paymentStatus;
/**
* 医保卡号
*/
@Excel(name = "医保卡号", width = 15)
@ApiModelProperty(value = "医保卡号")
private String medicalCard;
/**
* 文化程度
*/
@Excel(name = "文化程度", width = 15)
@ApiModelProperty(value = "文化程度")
private String educationLevel;
/**
* 婚姻状况
*/
@Excel(name = "婚姻状况", width = 15)
@ApiModelProperty(value = "婚姻状况")
private String maritalStatus;
/**
* 宗教信仰
*/
@Excel(name = "宗教信仰", width = 15)
@ApiModelProperty(value = "宗教信仰")
private String religiousBeliefs;
/**
* 身份证正面
*/
@ -170,24 +128,6 @@ public class ElderModifyInfo implements Serializable {
@Excel(name = "身份证反面", width = 15)
@ApiModelProperty(value = "身份证反面")
private String idCardNegative;
/**
* 户口本本人页
*/
@Excel(name = "户口本本人页", width = 15)
@ApiModelProperty(value = "户口本本人页")
private String accountBookHimself;
/**
* 医保卡正面
*/
@Excel(name = "医保卡正面", width = 15)
@ApiModelProperty(value = "医保卡正面")
private String frontMedical;
/**
* 医保卡反面
*/
@Excel(name = "医保卡反面", width = 15)
@ApiModelProperty(value = "医保卡反面")
private String negaticeMedical;
/**
* 备注
*/
@ -336,18 +276,6 @@ public class ElderModifyInfo implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "发卡日期")
private Date cardIssuing;
/**
* 血型
*/
@Excel(name = "血型", width = 15)
@ApiModelProperty(value = "血型")
private String bloodType;
/**
* 兵役状况
*/
@Excel(name = "兵役状况", width = 15)
@ApiModelProperty(value = "兵役状况")
private String militaryType;
/**
* 修改类型 zz长者 jhr监护人
*/

212
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/controller/NuBizEmployeesServcieTagsController.java
View File

@ -1,212 +0,0 @@
package com.nu.modules.employeesInfo.controller;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.compress.utils.Lists;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.query.QueryGenerator;
import com.nu.modules.employeesInfo.entity.NuBizEmployeesServcieTags;
import com.nu.modules.employeesInfo.service.INuBizEmployeesServcieTagsService;
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.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
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-04-01
* @Version: V1.0
*/
@Api(tags = "员工配置的服务标签")
@RestController
@RequestMapping("/bizEmployeesInfo/nuBizEmployeesServcieTags")
@Slf4j
public class NuBizEmployeesServcieTagsController extends JeecgController<NuBizEmployeesServcieTags, INuBizEmployeesServcieTagsService> {
@Autowired
private INuBizEmployeesServcieTagsService nuBizEmployeesServcieTagsService;
@Autowired
private ISysBaseAPI sysBaseAPI;
/**
* 分页列表查询
*
* @param nuBizEmployeesServcieTags
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "员工配置的服务标签-分页列表查询")
@ApiOperation(value = "员工配置的服务标签-分页列表查询", notes = "员工配置的服务标签-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<NuBizEmployeesServcieTags>> queryPageList(NuBizEmployeesServcieTags nuBizEmployeesServcieTags,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<NuBizEmployeesServcieTags> queryWrapper = QueryGenerator.initQueryWrapper(nuBizEmployeesServcieTags, req.getParameterMap());
Page<NuBizEmployeesServcieTags> page = new Page<NuBizEmployeesServcieTags>(pageNo, pageSize);
IPage<NuBizEmployeesServcieTags> pageList = nuBizEmployeesServcieTagsService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param nuBizEmployeesServcieTags
* @return
*/
@AutoLog(value = "员工配置的服务标签-添加")
@ApiOperation(value = "员工配置的服务标签-添加", notes = "员工配置的服务标签-添加")
// @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) {
nuBizEmployeesServcieTagsService.save(nuBizEmployeesServcieTags);
return Result.OK("添加成功！");
}
/**
* 保存
*
* @param saveDataList
* @return
*/
@AutoLog(value = "服务标签-保存")
@ApiOperation(value = "服务标签-保存", notes = "服务标签-保存")
@PostMapping(value = "/addBatch")
public Result<String> addBatch(@RequestBody List<NuBizEmployeesServcieTags> saveDataList) {
String empId = saveDataList.get(0).getEmployeesId();
JSONObject deptInfo = sysBaseAPI.getDeptInfo();
String orgCode = deptInfo.getString("code");
//先删再存
nuBizEmployeesServcieTagsService.physicsDeleteByEmpId(empId);
if ("save".equals(saveDataList.get(0).getOptType())) {
List<NuBizEmployeesServcieTags> saveData = Lists.newArrayList();
//解决排序问题
LocalDateTime now = LocalDateTime.now();
int secondsOffset = 0;
for (NuBizEmployeesServcieTags item : saveDataList) {
NuBizEmployeesServcieTags data = new NuBizEmployeesServcieTags();
data.setEmployeesId(empId);
data.setType(item.getType());
data.setTagsId(item.getEmployeesTagsId());
data.setSysOrgCode(orgCode);
data.setCreateTime(Date.from(now.plusSeconds(secondsOffset).atZone(ZoneId.systemDefault()).toInstant()));
secondsOffset++;
saveData.add(data);
}
nuBizEmployeesServcieTagsService.saveBatch(saveData);
}
return Result.OK("保存成功！");
}
/**
* 编辑
*
* @param nuBizEmployeesServcieTags
* @return
*/
@AutoLog(value = "员工配置的服务标签-编辑")
@ApiOperation(value = "员工配置的服务标签-编辑", notes = "员工配置的服务标签-编辑")
@RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) {
nuBizEmployeesServcieTagsService.updateById(nuBizEmployeesServcieTags);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "员工配置的服务标签-通过id删除")
@ApiOperation(value = "员工配置的服务标签-通过id删除", notes = "员工配置的服务标签-通过id删除")
// @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
nuBizEmployeesServcieTagsService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "员工配置的服务标签-批量删除")
@ApiOperation(value = "员工配置的服务标签-批量删除", notes = "员工配置的服务标签-批量删除")
@RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.nuBizEmployeesServcieTagsService.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<NuBizEmployeesServcieTags> queryById(@RequestParam(name = "id", required = true) String id) {
NuBizEmployeesServcieTags nuBizEmployeesServcieTags = nuBizEmployeesServcieTagsService.getById(id);
if (nuBizEmployeesServcieTags == null) {
return Result.error("未找到对应数据");
}
return Result.OK(nuBizEmployeesServcieTags);
}
/**
* 导出excel
*
* @param request
* @param nuBizEmployeesServcieTags
*/
@RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, NuBizEmployeesServcieTags nuBizEmployeesServcieTags) {
return super.exportXls(request, nuBizEmployeesServcieTags, NuBizEmployeesServcieTags.class, "员工配置的服务标签");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, NuBizEmployeesServcieTags.class);
}
}

74
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/entity/NuBizEmployeesServcieTags.java
View File

@ -1,74 +0,0 @@
package com.nu.modules.employeesInfo.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 员工配置的服务标签
* @Author: jeecg-boot
* @Date: 2025-04-01
* @Version: V1.0
*/
@Data
@TableName("nu_biz_employees_service_tags")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_employees_servcie_tags对象", description="员工配置的服务标签")
public class NuBizEmployeesServcieTags 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 employeesId;
/**类型 bq：标签 zl:指令*/
@Excel(name = "类型", width = 15)
@ApiModelProperty(value = "类型")
@Dict(dicCode = "emp_service_tag_type")
private java.lang.String type;
/**标签id*/
@Excel(name = "标签id", width = 15)
@ApiModelProperty(value = "标签id")
private java.lang.String tagsId;
/**创建人*/
@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;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
@TableField(exist = false)
private String employeesTagsId;
@TableField(exist = false)
private String optType;
}

16
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/NuBizEmployeesServcieTagsMapper.java
View File

@ -1,16 +0,0 @@
package com.nu.modules.employeesInfo.mapper;
import com.nu.modules.employeesInfo.entity.NuBizEmployeesServcieTags;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @Description: 员工配置的服务标签
* @Author: jeecg-boot
* @Date: 2025-04-01
* @Version: V1.0
*/
public interface NuBizEmployeesServcieTagsMapper extends BaseMapper<NuBizEmployeesServcieTags> {
int physicsDeleteByEmpId(@Param("empId") String employeesId);
}

8
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/mapper/xml/NuBizEmployeesServcieTagsMapper.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.employeesInfo.mapper.NuBizEmployeesServcieTagsMapper">
<delete id="physicsDeleteByEmpId">
delete from nu_biz_employees_service_tags where employees_id = #{empId}
</delete>
</mapper>

15
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/INuBizEmployeesServcieTagsService.java
View File

@ -1,15 +0,0 @@
package com.nu.modules.employeesInfo.service;
import com.nu.modules.employeesInfo.entity.NuBizEmployeesServcieTags;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 员工配置的服务标签
* @Author: jeecg-boot
* @Date: 2025-04-01
* @Version: V1.0
*/
public interface INuBizEmployeesServcieTagsService extends IService<NuBizEmployeesServcieTags> {
int physicsDeleteByEmpId(String employeesId);
}

23
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/NuBizEmployeesServcieTagsServiceImpl.java
View File

@ -1,23 +0,0 @@
package com.nu.modules.employeesInfo.service.impl;
import com.nu.modules.employeesInfo.entity.NuBizEmployeesServcieTags;
import com.nu.modules.employeesInfo.mapper.NuBizEmployeesServcieTagsMapper;
import com.nu.modules.employeesInfo.service.INuBizEmployeesServcieTagsService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 员工配置的服务标签
* @Author: jeecg-boot
* @Date: 2025-04-01
* @Version: V1.0
*/
@Service
public class NuBizEmployeesServcieTagsServiceImpl extends ServiceImpl<NuBizEmployeesServcieTagsMapper, NuBizEmployeesServcieTags> implements INuBizEmployeesServcieTagsService {
@Override
public int physicsDeleteByEmpId(String employeesId) {
return baseMapper.physicsDeleteByEmpId(employeesId);
}
}

1
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java
View File

@ -169,7 +169,6 @@ public class EmployeesApplyController extends JeecgController<EmployeesApply, IE
mqdto.setIssuingAuthority(apply.getIssuingAuthority());
mqdto.setCardZmPath(apply.getIdCardPositive());
mqdto.setCardFmPath(apply.getIdCardNegative());
mqdto.setMaritalStatus(apply.getMarriedOrNot());
mqdto.setHeight(apply.getHeight());
mqdto.setWeight(apply.getWeight());
mqdto.setHealthStatus(apply.getHealthStatus());

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

@ -1,223 +0,0 @@
package com.nu.modules.config.servicetag.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.config.servicetag.entity.ServiceTag;
import com.nu.modules.config.servicetag.service.IServiceTagService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Description: 服务标签
* @Author: 张明远
* @Date: 2025-03-31
* @Version: V1.0
*/
@Api(tags = "服务标签")
@RestController
@RequestMapping("/services/serviceTag/serviceTag")
@Slf4j
public class ServiceTagController extends JeecgController<ServiceTag, IServiceTagService> {
@Autowired
private IServiceTagService serviceTagService;
/**
* 分页列表查询
*
* @param serviceTag
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "服务标签-分页列表查询")
@ApiOperation(value = "服务标签-分页列表查询", notes = "服务标签-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ServiceTag>> queryPageList(ServiceTag serviceTag, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR
customeRuleMap.put("tagName", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<ServiceTag> queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(), customeRuleMap);
Page<ServiceTag> page = new Page<ServiceTag>(pageNo, pageSize);
queryWrapper.select("id");
queryWrapper.orderByDesc("create_time");
IPage<ServiceTag> pageList = serviceTagService.page(page, queryWrapper);
if (pageList.getRecords() != null && !pageList.getRecords().isEmpty()) {
serviceTagService.queryList(serviceTag, pageList);
}
return Result.OK(pageList);
}
/**
* 添加
*
* @param serviceTag
* @return
*/
@AutoLog(value = "服务标签-添加")
@ApiOperation(value = "服务标签-添加", notes = "服务标签-添加")
@RequiresPermissions("serviceTag:servtag_directive:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ServiceTag serviceTag) {
serviceTagService.save(serviceTag);
if (serviceTag.getDirectives() != null && !serviceTag.getDirectives().isEmpty()) {
serviceTagService.saveDirectives(serviceTag);
}
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param serviceTag
* @return
*/
@AutoLog(value = "服务标签-编辑")
@ApiOperation(value = "服务标签-编辑", notes = "服务标签-编辑")
@RequiresPermissions("serviceTag:servtag_directive:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ServiceTag serviceTag) {
serviceTagService.updateById(serviceTag);
if (serviceTag.getDirectives() != null && !serviceTag.getDirectives().isEmpty()) {
serviceTagService.saveDirectives(serviceTag);
}
return Result.OK("编辑成功!");
}
/**
* 作废
* @param serviceTag
* @return
*/
@AutoLog(value = "服务标签-作废")
@ApiOperation(value = "服务标签-作废", notes = "服务标签-作废")
@RequestMapping(value = "/cancellation", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> cancellation(@RequestBody ServiceTag serviceTag) {
serviceTagService.updateById(serviceTag);
//移除员工已分配员工标签
serviceTagService.removeTag(serviceTag.getId());
return Result.OK("操作成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "服务标签-通过id删除")
@ApiOperation(value = "服务标签-通过id删除", notes = "服务标签-通过id删除")
@RequiresPermissions("serviceTag:servtag_directive:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
serviceTagService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "服务标签-批量删除")
@ApiOperation(value = "服务标签-批量删除", notes = "服务标签-批量删除")
@RequiresPermissions("serviceTag:servtag_directive:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.serviceTagService.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<ServiceTag> queryById(@RequestParam(name = "id", required = true) String id) {
ServiceTag serviceTag = serviceTagService.queryById(id);
if (serviceTag == null) {
return Result.error("未找到对应数据");
}
return Result.OK(serviceTag);
}
/**
* 导出excel
*
* @param request
* @param serviceTag
*/
@RequiresPermissions("serviceTag:servtag_directive:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ServiceTag serviceTag) {
return super.exportXls(request, serviceTag, ServiceTag.class, "服务标签");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("serviceTag:servtag_directive:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ServiceTag.class);
}
/**
* 获取服务标签列表根据员工id
*
* @param serviceTag
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/getEmployeesList")
public Result<IPage<ServiceTag>> getEmployeesList(ServiceTag serviceTag, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
if (StringUtils.isEmpty(serviceTag.getEmployeesId())) {
return Result.error("员工id不能为空");
}
Page<ServiceTag> page = new Page<ServiceTag>(pageNo, pageSize);
IPage<ServiceTag> pageList = serviceTagService.getEmployeesList(page, serviceTag);
return Result.OK(pageList);
}
@GetMapping(value = "/getEmployeesServiceTags")
public Result<List<ServiceTag>> getEmployeesServiceTags(ServiceTag serviceTag) {
if (StringUtils.isEmpty(serviceTag.getEmployeesId())) {
return Result.error("员工id不能为空");
}
List<ServiceTag> pageList = serviceTagService.getEmployeesServiceTags(serviceTag);
return Result.OK(pageList);
}
}

86
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/entity/ServiceTag.java
View File

@ -1,86 +0,0 @@
package com.nu.modules.config.servicetag.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/**
* @Description: 服务标签
* @Author: 张明远
* @Date: 2025-03-31
* @Version: V1.0
*/
@Data
@TableName("nu_service_tag_main")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_service_tag对象", description="服务标签")
public class ServiceTag implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**服务标签名称*/
@Excel(name = "服务标签名称", width = 15)
@ApiModelProperty(value = "服务标签名称")
private String tagName;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String description;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
private Integer sort;
/**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用", width = 15, dicCode = "iz_enabled")
@Dict(dicCode = "iz_enabled")
@ApiModelProperty(value = "是否启用")
private String izEnabled;
/**是否删除 0未删除 1删除*/
@Excel(name = "是否删除", width = 15)
@ApiModelProperty(value = "是否删除")
@TableLogic
private String delFlag;
/**创建人*/
@ApiModelProperty(value = "创建人")
@Dict(dictTable = "sys_user",dicCode = "username",dicText = "realname")
private 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 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;
@TableField(exist = false)
private List<ConfigServiceDirective> directives;
@TableField(exist = false)
@Dict(dicCode = "emp_service_tag_type")
private String type;
@TableField(exist = false)
private String employeesTagsId;
@TableField(exist = false)
private String employeesId;
}

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

@ -1,32 +0,0 @@
package com.nu.modules.config.servicetag.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.config.servicetag.entity.ServiceTag;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 服务标签
* @Author: 张明远
* @Date: 2025-03-31
* @Version: V1.0
*/
public interface ServiceTagMapper extends BaseMapper<ServiceTag> {
int deleteDirectives(@Param("tag") ServiceTag serviceTag);
int saveDirectives(@Param("tag") ServiceTag serviceTag);
List<ServiceTag> queryList( @Param("serviceTag") ServiceTag serviceTag,@Param("ids") List<ServiceTag> ids);
Long queryTotal(@Param("serviceTag") ServiceTag serviceTag);
IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag serviceTag);
List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag);
int removeTag(@Param("tagId") String tagId);
}

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

@ -1,167 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.config.servicetag.mapper.ServiceTagMapper">
<!-- 定义 resultMap -->
<resultMap id="ServiceTagResultMap" type="com.nu.modules.config.servicetag.entity.ServiceTag">
<id property="id" column="id"/>
<result property="tagName" column="tag_name"/>
<result property="description" column="description"/>
<result property="sort" column="sort"/>
<result property="izEnabled" column="iz_enabled"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<!-- 关联的指令列表 -->
<collection property="directives" ofType="com.nu.modules.config.servicedirective.entity.ConfigServiceDirective">
<id property="id" column="directive_id"/>
<result property="directiveName" column="directive_name"/>
<result property="categoryId" column="category_id"/>
<result property="typeId" column="type_id"/>
<result property="instructionTagId" column="instruction_tag_id"/>
<result property="serviceAttribute" column="service_attribute"/>
<result property="serviceAttributeName" column="serviceAttributeName"/>
<result property="tollPrice" column="toll_price"/>
<result property="comPrice" column="com_price"/>
<result property="serviceContent" column="service_content"/>
<result property="serviceDuration" column="service_duration"/>
<result property="izEnabled" column="directive_iz_enabled"/>
<result property="delFlag" column="directive_del_flag"/>
<result property="createBy" column="directive_create_by"/>
<result property="createTime" column="directive_create_time"/>
<result property="updateBy" column="directive_update_by"/>
<result property="updateTime" column="directive_update_time"/>
<result property="sysOrgCode" column="directive_sys_org_code"/>
<result property="mp3File" column="mp3_file"/>
<result property="mp4File" column="mp4_file"/>
<result property="instructionName" column="csi_instruction_name"/>
<result property="categoryName" column="csc_category_name"/>
<result property="typeName" column="cst_type_name"/>
<result property="previewFile" column="preview_file"/>
<result property="immediateFile" column="immediate_file"/>
</collection>
</resultMap>
<!-- 分页查询 -->
<select id="queryList" resultMap="ServiceTagResultMap">
SELECT
dp.id,
dp.tag_name,
dp.description,
dp.sort,
dp.iz_enabled,
dp.del_flag,
dp.create_by,
dp.create_time,
dp.update_by,
dp.update_time,
csd.id AS directive_id,
csd.directive_name,
csd.category_id,
csd.type_id,
csd.instruction_tag_id,
csd.service_attribute,
case csd.service_attribute when 'ds' then '定时' when 'js' then '计时' else null end as serviceAttributeName,
csd.toll_price,
csd.com_price,
csd.service_content,
csd.service_duration,
csd.iz_enabled AS directive_iz_enabled,
csd.del_flag AS directive_del_flag,
csd.create_by AS directive_create_by,
csd.create_time AS directive_create_time,
csd.update_by AS directive_update_by,
csd.update_time AS directive_update_time,
csd.sys_org_code AS directive_sys_org_code,
csd.mp3_file,
csd.mp4_file,
csd.preview_file,
csd.immediate_file,
csi.instruction_name AS csi_instruction_name,
csc.category_name AS csc_category_name,
cst.type_name AS cst_type_name
FROM
(SELECT * FROM nu_service_tag_main
<where>
del_flag = '0' and id in
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item.id}
</foreach>
</where>
) dp
LEFT JOIN nu_service_tag_info sd ON dp.id = sd.tag_id
LEFT JOIN nu_config_service_directive csd ON sd.directive_id = csd.id
LEFT JOIN nu_config_service_instruction_tag csi ON csd.instruction_tag_id = csi.id
LEFT JOIN nu_config_service_category csc ON csd.category_id = csc.id
LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id
order by dp.create_time desc
</select>
<!-- 查询总记录数 -->
<select id="queryTotal" resultType="java.lang.Long">
SELECT COUNT(*)
FROM nu_service_tag_main
<where>
del_flag = '0'
<if test="serviceTag.tagName != null and serviceTag.tagName != ''">
AND tag_name LIKE CONCAT('%', #{serviceTag.tagName}, '%')
</if>
<if test="serviceTag.izEnabled != null and serviceTag.izEnabled != ''">
AND iz_enabled = #{serviceTag.izEnabled}
</if>
</where>
</select>
<delete id="deleteDirectives">
delete
from nu_service_tag_info
where tag_id = #{tag.id}
</delete>
<delete id="removeTag">
delete from nu_biz_employees_service_tags where tags_id = #{tagId} and type = 'bq'
</delete>
<insert id="saveDirectives">
INSERT INTO nu_service_tag_info (tag_id, directive_id, sort)
VALUES
<foreach collection="tag.getDirectives()" item="directive" separator=",">
(#{tag.id}, #{directive.id}, #{directive.sort})
</foreach>
</insert>
<select id="getEmployeesList" resultType="com.nu.modules.config.servicetag.entity.ServiceTag">
select nst.id,
nst.tag_name,
nst.description,
nst.sort,
ifnull(est.id, '0') as employeesTagsId,
nst.iz_enabled,
nst.del_flag,
nst.create_time,
est.employees_id
from nu_service_tag_main nst
LEFT JOIN nu_biz_employees_service_tags est
on nst.id = est.tags_id and est.employees_id = #{serviceTag.employeesId}
where nst.del_flag = '0'
and nst.iz_enabled = 'Y'
</select>
<select id="getEmployeesServiceTags" resultType="com.nu.modules.config.servicetag.entity.ServiceTag">
select a.id,
a.type,
a.create_time,
case a.type when 'bq' then bq.instruction_name when 'zl' then zl.directive_name else null end AS tag_name,
case a.type when 'bq' then bq.instruction_name when 'zl' then zl.service_content else null end AS description,
case a.type when 'bq' then bq.id when 'zl' then zl.id else null end AS employeesTagsId
from nu_biz_employees_service_tags a
LEFT JOIN nu_config_service_directive zl on a.tags_id = zl.id
LEFT JOIN nu_config_service_instruction_tag bq on a.tags_id = bq.id
where a.employees_id = #{employeesId}
</select>
</mapper>

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

@ -1,33 +0,0 @@
package com.nu.modules.config.servicetag.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.config.servicetag.entity.ServiceTag;
import java.util.List;
/**
* @Description: 服务标签
* @Author: 张明远
* @Date: 2025-03-31
* @Version: V1.0
*/
public interface IServiceTagService extends IService<ServiceTag> {
/**
* 存储服务标签对应的服务指令
* @param serviceTag
*/
void saveDirectives(ServiceTag serviceTag);
void queryList(ServiceTag serviceTag, IPage<ServiceTag> pageList);
ServiceTag queryById(String id);
IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag queryWrapper);
List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag);
void removeTag(String id);
}

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

@ -1,63 +0,0 @@
package com.nu.modules.config.servicetag.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.nu.modules.config.servicetag.entity.ServiceTag;
import com.nu.modules.config.servicetag.mapper.ServiceTagMapper;
import com.nu.modules.config.servicetag.service.IServiceTagService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 服务标签
* @Author: 张明远
* @Date: 2025-03-31
* @Version: V1.0
*/
@Service
public class ServiceTagServiceImpl extends ServiceImpl<ServiceTagMapper, ServiceTag> implements IServiceTagService {
@Override
public void saveDirectives(ServiceTag serviceTag) {
baseMapper.deleteDirectives(serviceTag);
baseMapper.saveDirectives(serviceTag);
}
@Override
public void queryList(ServiceTag serviceTag, IPage<ServiceTag> pageList) {
List<ServiceTag> record = baseMapper.queryList(serviceTag,pageList.getRecords());
pageList.setRecords(record);
}
@Override
public ServiceTag queryById(String id) {
List<ServiceTag> query = Lists.newArrayList();
ServiceTag queryDto = new ServiceTag().setId(id);
query.add(queryDto);
List<ServiceTag> serviceTags = baseMapper.queryList(null, query);
return serviceTags.stream().findFirst().orElse(null);
}
@Override
public IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag queryWrapper) {
return baseMapper.getEmployeesList(page,queryWrapper);
}
@Override
public List<ServiceTag> getEmployeesServiceTags(ServiceTag serviceTag) {
return baseMapper.getEmployeesServiceTags(serviceTag);
}
/**
* 移除所有员工已分配的此员工标签
* @param tagId
*/
@Override
public void removeTag(String tagId) {
baseMapper.removeTag(tagId);
}
}

1
nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java
View File

@ -163,7 +163,6 @@ public class DirectiveMQListener {
//查询现有服务指令
QueryWrapper<ConfigServiceDirective> qw = new QueryWrapper<>();
qw.eq("id", dto.getId());
ConfigServiceDirective currentDirective = directiveService.getOne(qw);
//更新服务指令媒体资源字段
ConfigServiceDirective configServiceDirective = new ConfigServiceDirective();