Merge branch '3.11_院后第二增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量

This commit is contained in:
youxilong 2024-03-11 17:50:31 +08:00
commit 94890fe73b
8 changed files with 624 additions and 1 deletions

View File

@ -149,6 +149,11 @@ public class SysUser extends BaseEntity {
*/ */
private Long departmentId; private Long departmentId;
/**
* 岗位名称医生DOCTOR健康管理师HEALTH_MANAGE_MASTER
*/
private String postName;
public SysUser() { public SysUser() {
} }
@ -349,6 +354,14 @@ public class SysUser extends BaseEntity {
this.userBirthDate = userBirthDate; this.userBirthDate = userBirthDate;
} }
public String getPostName() {
return postName;
}
public void setPostName(String postName) {
this.postName = postName;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

View File

@ -0,0 +1,91 @@
package com.xinelu.manage.controller.taskpartitiondict;
import com.xinelu.common.annotation.Log;
import com.xinelu.common.core.controller.BaseController;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.page.TableDataInfo;
import com.xinelu.common.enums.BusinessType;
import com.xinelu.common.utils.poi.ExcelUtil;
import com.xinelu.manage.domain.taskpartitiondict.TaskPartitionDict;
import com.xinelu.manage.service.taskpartitiondict.ITaskPartitionDictService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 任务细分字典Controller
*
* @author xinelu
* @date 2024-03-11
*/
@RestController
@RequestMapping("/system/partition")
public class TaskPartitionDictController extends BaseController {
@Resource
private ITaskPartitionDictService taskPartitionDictService;
/**
* 查询任务细分字典列表
*/
@PreAuthorize("@ss.hasPermi('system:partition:list')")
@GetMapping("/list")
public TableDataInfo list(TaskPartitionDict taskPartitionDict) {
startPage();
List<TaskPartitionDict> list = taskPartitionDictService.selectTaskPartitionDictList(taskPartitionDict);
return getDataTable(list);
}
/**
* 导出任务细分字典列表
*/
@PreAuthorize("@ss.hasPermi('system:partition:export')")
@Log(title = "任务细分字典", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TaskPartitionDict taskPartitionDict) {
List<TaskPartitionDict> list = taskPartitionDictService.selectTaskPartitionDictList(taskPartitionDict);
ExcelUtil<TaskPartitionDict> util = new ExcelUtil<TaskPartitionDict>(TaskPartitionDict.class);
util.exportExcel(response, list, "任务细分字典数据");
}
/**
* 获取任务细分字典详细信息
*/
@PreAuthorize("@ss.hasPermi('system:partition:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(taskPartitionDictService.selectTaskPartitionDictById(id));
}
/**
* 新增任务细分字典
*/
@PreAuthorize("@ss.hasPermi('system:partition:add')")
@Log(title = "任务细分字典", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TaskPartitionDict taskPartitionDict) {
return toAjax(taskPartitionDictService.insertTaskPartitionDict(taskPartitionDict));
}
/**
* 修改任务细分字典
*/
@PreAuthorize("@ss.hasPermi('system:partition:edit')")
@Log(title = "任务细分字典", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TaskPartitionDict taskPartitionDict) {
return toAjax(taskPartitionDictService.updateTaskPartitionDict(taskPartitionDict));
}
/**
* 删除任务细分字典
*/
@PreAuthorize("@ss.hasPermi('system:partition:remove')")
@Log(title = "任务细分字典", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(taskPartitionDictService.deleteTaskPartitionDictByIds(ids));
}
}

View File

@ -0,0 +1,112 @@
package com.xinelu.manage.domain.taskpartitiondict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 任务细分字典对象 task_partition_dict
*
* @author xinelu
* @date 2024-03-11
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "任务细分字典对象", description = "task_partition_dict")
public class TaskPartitionDict extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long id;
/**
* 任务类型表id
*/
@ApiModelProperty(value = "任务类型表id")
@Excel(name = "任务类型表id")
private Long taskTypeId;
/**
* 任务类型名称
*/
@ApiModelProperty(value = "任务类型名称")
@Excel(name = "任务类型名称")
private String taskTypeName;
/**
* 任务细分名称
*/
@ApiModelProperty(value = "任务细分名称")
@Excel(name = "任务细分名称")
private String taskPartitionName;
/**
* 任务细分编码
*/
@ApiModelProperty(value = "任务细分编码")
@Excel(name = "任务细分编码")
private String taskPartitionCode;
/**
* 二级分类描述
*/
@ApiModelProperty(value = "二级分类描述")
@Excel(name = "二级分类描述")
private String secondClassifyDescribe;
/**
* 执行时间格式HH:mm
*/
@ApiModelProperty(value = "执行时间格式HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "执行时间格式HH:mm", width = 30, dateFormat = "yyyy-MM-dd")
private Date executionTime;
/**
* 任务细分排序
*/
@ApiModelProperty(value = "任务细分排序")
@Excel(name = "任务细分排序")
private Integer taskPartitionSort;
/**
* 任务细分备注
*/
@ApiModelProperty(value = "任务细分备注")
@Excel(name = "任务细分备注")
private String taskPartitionRemark;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("taskTypeId", getTaskTypeId())
.append("taskTypeName", getTaskTypeName())
.append("taskPartitionName", getTaskPartitionName())
.append("taskPartitionCode", getTaskPartitionCode())
.append("secondClassifyDescribe", getSecondClassifyDescribe())
.append("executionTime", getExecutionTime())
.append("taskPartitionSort", getTaskPartitionSort())
.append("taskPartitionRemark", getTaskPartitionRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

View File

@ -0,0 +1,62 @@
package com.xinelu.manage.mapper.taskpartitiondict;
import com.xinelu.manage.domain.taskpartitiondict.TaskPartitionDict;
import java.util.List;
/**
* 任务细分字典Mapper接口
*
* @author xinelu
* @date 2024-03-11
*/
public interface TaskPartitionDictMapper {
/**
* 查询任务细分字典
*
* @param id 任务细分字典主键
* @return 任务细分字典
*/
TaskPartitionDict selectTaskPartitionDictById(Long id);
/**
* 查询任务细分字典列表
*
* @param taskPartitionDict 任务细分字典
* @return 任务细分字典集合
*/
List<TaskPartitionDict> selectTaskPartitionDictList(TaskPartitionDict taskPartitionDict);
/**
* 新增任务细分字典
*
* @param taskPartitionDict 任务细分字典
* @return 结果
*/
int insertTaskPartitionDict(TaskPartitionDict taskPartitionDict);
/**
* 修改任务细分字典
*
* @param taskPartitionDict 任务细分字典
* @return 结果
*/
int updateTaskPartitionDict(TaskPartitionDict taskPartitionDict);
/**
* 删除任务细分字典
*
* @param id 任务细分字典主键
* @return 结果
*/
int deleteTaskPartitionDictById(Long id);
/**
* 批量删除任务细分字典
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
int deleteTaskPartitionDictByIds(Long[] ids);
}

View File

@ -0,0 +1,61 @@
package com.xinelu.manage.service.taskpartitiondict;
import com.xinelu.manage.domain.taskpartitiondict.TaskPartitionDict;
import java.util.List;
/**
* 任务细分字典Service接口
*
* @author xinelu
* @date 2024-03-11
*/
public interface ITaskPartitionDictService {
/**
* 查询任务细分字典
*
* @param id 任务细分字典主键
* @return 任务细分字典
*/
TaskPartitionDict selectTaskPartitionDictById(Long id);
/**
* 查询任务细分字典列表
*
* @param taskPartitionDict 任务细分字典
* @return 任务细分字典集合
*/
List<TaskPartitionDict> selectTaskPartitionDictList(TaskPartitionDict taskPartitionDict);
/**
* 新增任务细分字典
*
* @param taskPartitionDict 任务细分字典
* @return 结果
*/
int insertTaskPartitionDict(TaskPartitionDict taskPartitionDict);
/**
* 修改任务细分字典
*
* @param taskPartitionDict 任务细分字典
* @return 结果
*/
int updateTaskPartitionDict(TaskPartitionDict taskPartitionDict);
/**
* 批量删除任务细分字典
*
* @param ids 需要删除的任务细分字典主键集合
* @return 结果
*/
int deleteTaskPartitionDictByIds(Long[] ids);
/**
* 删除任务细分字典信息
*
* @param id 任务细分字典主键
* @return 结果
*/
int deleteTaskPartitionDictById(Long id);
}

View File

@ -0,0 +1,91 @@
package com.xinelu.manage.service.taskpartitiondict.impl;
import com.xinelu.common.utils.DateUtils;
import com.xinelu.manage.domain.taskpartitiondict.TaskPartitionDict;
import com.xinelu.manage.mapper.taskpartitiondict.TaskPartitionDictMapper;
import com.xinelu.manage.service.taskpartitiondict.ITaskPartitionDictService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 任务细分字典Service业务层处理
*
* @author xinelu
* @date 2024-03-11
*/
@Service
public class TaskPartitionDictServiceImpl implements ITaskPartitionDictService {
@Resource
private TaskPartitionDictMapper taskPartitionDictMapper;
/**
* 查询任务细分字典
*
* @param id 任务细分字典主键
* @return 任务细分字典
*/
@Override
public TaskPartitionDict selectTaskPartitionDictById(Long id) {
return taskPartitionDictMapper.selectTaskPartitionDictById(id);
}
/**
* 查询任务细分字典列表
*
* @param taskPartitionDict 任务细分字典
* @return 任务细分字典
*/
@Override
public List<TaskPartitionDict> selectTaskPartitionDictList(TaskPartitionDict taskPartitionDict) {
return taskPartitionDictMapper.selectTaskPartitionDictList(taskPartitionDict);
}
/**
* 新增任务细分字典
*
* @param taskPartitionDict 任务细分字典
* @return 结果
*/
@Override
public int insertTaskPartitionDict(TaskPartitionDict taskPartitionDict) {
taskPartitionDict.setCreateTime(DateUtils.getNowDate());
return taskPartitionDictMapper.insertTaskPartitionDict(taskPartitionDict);
}
/**
* 修改任务细分字典
*
* @param taskPartitionDict 任务细分字典
* @return 结果
*/
@Override
public int updateTaskPartitionDict(TaskPartitionDict taskPartitionDict) {
taskPartitionDict.setUpdateTime(DateUtils.getNowDate());
return taskPartitionDictMapper.updateTaskPartitionDict(taskPartitionDict);
}
/**
* 批量删除任务细分字典
*
* @param ids 需要删除的任务细分字典主键
* @return 结果
*/
@Override
public int deleteTaskPartitionDictByIds(Long[] ids) {
return taskPartitionDictMapper.deleteTaskPartitionDictByIds(ids);
}
/**
* 删除任务细分字典信息
*
* @param id 任务细分字典主键
* @return 结果
*/
@Override
public int deleteTaskPartitionDictById(Long id) {
return taskPartitionDictMapper.deleteTaskPartitionDictById(id);
}
}

View File

@ -0,0 +1,188 @@
<?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.xinelu.manage.mapper.taskpartitiondict.TaskPartitionDictMapper">
<resultMap type="TaskPartitionDict" id="TaskPartitionDictResult">
<result property="id" column="id"/>
<result property="taskTypeId" column="task_type_id"/>
<result property="taskTypeName" column="task_type_name"/>
<result property="taskPartitionName" column="task_partition_name"/>
<result property="taskPartitionCode" column="task_partition_code"/>
<result property="secondClassifyDescribe" column="second_classify_describe"/>
<result property="executionTime" column="execution_time"/>
<result property="taskPartitionSort" column="task_partition_sort"/>
<result property="taskPartitionRemark" column="task_partition_remark"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<sql id="selectTaskPartitionDictVo">
select id,
task_type_id,
task_type_name,
task_partition_name,
task_partition_code,
second_classify_describe,
execution_time,
task_partition_sort,
task_partition_remark,
create_by,
create_time,
update_by,
update_time
from task_partition_dict
</sql>
<select id="selectTaskPartitionDictList" parameterType="TaskPartitionDict" resultMap="TaskPartitionDictResult">
<include refid="selectTaskPartitionDictVo"/>
<where>
<if test="taskTypeId != null ">
and task_type_id = #{taskTypeId}
</if>
<if test="taskTypeName != null and taskTypeName != ''">
and task_type_name like concat('%', #{taskTypeName}, '%')
</if>
<if test="taskPartitionName != null and taskPartitionName != ''">
and task_partition_name like concat('%', #{taskPartitionName}, '%')
</if>
<if test="taskPartitionCode != null and taskPartitionCode != ''">
and task_partition_code = #{taskPartitionCode}
</if>
<if test="secondClassifyDescribe != null and secondClassifyDescribe != ''">
and second_classify_describe = #{secondClassifyDescribe}
</if>
<if test="executionTime != null ">
and execution_time = #{executionTime}
</if>
<if test="taskPartitionSort != null ">
and task_partition_sort = #{taskPartitionSort}
</if>
<if test="taskPartitionRemark != null and taskPartitionRemark != ''">
and task_partition_remark = #{taskPartitionRemark}
</if>
</where>
</select>
<select id="selectTaskPartitionDictById" parameterType="Long"
resultMap="TaskPartitionDictResult">
<include refid="selectTaskPartitionDictVo"/>
where id = #{id}
</select>
<insert id="insertTaskPartitionDict" parameterType="TaskPartitionDict" useGeneratedKeys="true"
keyProperty="id">
insert into task_partition_dict
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskTypeId != null">task_type_id,
</if>
<if test="taskTypeName != null">task_type_name,
</if>
<if test="taskPartitionName != null">task_partition_name,
</if>
<if test="taskPartitionCode != null">task_partition_code,
</if>
<if test="secondClassifyDescribe != null">second_classify_describe,
</if>
<if test="executionTime != null">execution_time,
</if>
<if test="taskPartitionSort != null">task_partition_sort,
</if>
<if test="taskPartitionRemark != null">task_partition_remark,
</if>
<if test="createBy != null">create_by,
</if>
<if test="createTime != null">create_time,
</if>
<if test="updateBy != null">update_by,
</if>
<if test="updateTime != null">update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskTypeId != null">#{taskTypeId},
</if>
<if test="taskTypeName != null">#{taskTypeName},
</if>
<if test="taskPartitionName != null">#{taskPartitionName},
</if>
<if test="taskPartitionCode != null">#{taskPartitionCode},
</if>
<if test="secondClassifyDescribe != null">#{secondClassifyDescribe},
</if>
<if test="executionTime != null">#{executionTime},
</if>
<if test="taskPartitionSort != null">#{taskPartitionSort},
</if>
<if test="taskPartitionRemark != null">#{taskPartitionRemark},
</if>
<if test="createBy != null">#{createBy},
</if>
<if test="createTime != null">#{createTime},
</if>
<if test="updateBy != null">#{updateBy},
</if>
<if test="updateTime != null">#{updateTime},
</if>
</trim>
</insert>
<update id="updateTaskPartitionDict" parameterType="TaskPartitionDict">
update task_partition_dict
<trim prefix="SET" suffixOverrides=",">
<if test="taskTypeId != null">task_type_id =
#{taskTypeId},
</if>
<if test="taskTypeName != null">task_type_name =
#{taskTypeName},
</if>
<if test="taskPartitionName != null">task_partition_name =
#{taskPartitionName},
</if>
<if test="taskPartitionCode != null">task_partition_code =
#{taskPartitionCode},
</if>
<if test="secondClassifyDescribe != null">second_classify_describe =
#{secondClassifyDescribe},
</if>
<if test="executionTime != null">execution_time =
#{executionTime},
</if>
<if test="taskPartitionSort != null">task_partition_sort =
#{taskPartitionSort},
</if>
<if test="taskPartitionRemark != null">task_partition_remark =
#{taskPartitionRemark},
</if>
<if test="createBy != null">create_by =
#{createBy},
</if>
<if test="createTime != null">create_time =
#{createTime},
</if>
<if test="updateBy != null">update_by =
#{updateBy},
</if>
<if test="updateTime != null">update_time =
#{updateTime},
</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTaskPartitionDictById" parameterType="Long">
delete
from task_partition_dict
where id = #{id}
</delete>
<delete id="deleteTaskPartitionDictByIds" parameterType="String">
delete from task_partition_dict where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

View File

@ -27,6 +27,7 @@
<result property="userBirthDate" column="user_birth_date"/> <result property="userBirthDate" column="user_birth_date"/>
<result property="agencyId" column="agency_id"/> <result property="agencyId" column="agency_id"/>
<result property="departmentId" column="department_id"/> <result property="departmentId" column="department_id"/>
<result property="postName" column="post_name"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/> <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/> <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap> </resultMap>
@ -71,6 +72,7 @@
u.user_birth_date, u.user_birth_date,
u.agency_id, u.agency_id,
u.department_id, u.department_id,
u.post_name,
d.dept_id, d.dept_id,
d.parent_id, d.parent_id,
d.ancestors, d.ancestors,
@ -93,7 +95,7 @@
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.user_card_no,u.user_birth_date, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.user_card_no,u.user_birth_date,
u.agency_id,u.department_id,d.dept_name, d.leader from sys_user u u.agency_id,u.department_id,u.post_name,d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0' where u.del_flag = '0'
<if test="userId != null and userId != 0"> <if test="userId != null and userId != 0">
@ -215,6 +217,7 @@
<if test="userBirthDate != null">user_birth_date,</if> <if test="userBirthDate != null">user_birth_date,</if>
<if test="agencyId != null">agency_id,</if> <if test="agencyId != null">agency_id,</if>
<if test="departmentId != null">department_id,</if> <if test="departmentId != null">department_id,</if>
<if test="postName != null">post_name,</if>
create_time create_time
)values( )values(
<if test="userId != null and userId != ''">#{userId},</if> <if test="userId != null and userId != ''">#{userId},</if>
@ -233,6 +236,7 @@
<if test="userBirthDate != null">#{userBirthDate},</if> <if test="userBirthDate != null">#{userBirthDate},</if>
<if test="agencyId != null">#{agencyId},</if> <if test="agencyId != null">#{agencyId},</if>
<if test="departmentId != null">#{departmentId},</if> <if test="departmentId != null">#{departmentId},</if>
<if test="postName != null">#{postName},</if>
sysdate() sysdate()
) )
</insert> </insert>
@ -257,6 +261,7 @@
<if test="userBirthDate != null">user_birth_date = #{userBirthDate},</if> <if test="userBirthDate != null">user_birth_date = #{userBirthDate},</if>
<if test="agencyId != null">agency_id =#{agencyId},</if> <if test="agencyId != null">agency_id =#{agencyId},</if>
<if test="departmentId != null">department_id = #{departmentId},</if> <if test="departmentId != null">department_id = #{departmentId},</if>
<if test="postName != null">post_name = #{postName},</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
where user_id = #{userId} where user_id = #{userId}