Skip to content

L
long-tern-care-service
Commit 63252d71 authored by 蔡镇泽's avatar 蔡镇泽
Browse files
Options

查询评定人员列表

parent 3e9268cf
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 28 deletions
assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
View file @ 63252d71
package com.hungraim.ltc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
import com.hungraim.ltc.pojo.vo.assessment.AprEmpVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
......@@ -84,12 +84,15 @@ public class TaskController {
/**
* 查询评定人员列表
*
* @param organId 人员所属机构id
* @param organName 评定机构名称
* @param name 评定人员姓名
* @param tel 评定人员手机号码
* @param groupLeader 是否组长0组长，1非组长
*/
@RequestMapping("/aprEmpList")
public Result<List<ChAprEmp>> aprEmpList(Integer organId) {
List<ChAprEmp> chAprEmps = taskService.aprEmpList(organId);
return Result.success(chAprEmps);
public Result<List<AprEmpVO>> aprEmpList(String organName, String name, String tel, String groupLeader) {
List<AprEmpVO> aprEmpVOS = taskService.aprEmpList(organName, name, tel, groupLeader);
return Result.success(aprEmpVOS);
}
/**
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java
View file @ 63252d71
......@@ -3,6 +3,7 @@ package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
import com.hungraim.ltc.pojo.vo.assessment.AprEmpVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
......@@ -23,18 +24,18 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
/**
* 评定任务分配列表
*
* @param organIds 适用机构代码
* @param provincial 所在省
* @param city 所在市
* @param area 所在区域
* @param street 所在街道
* @param realName 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param taskName 评定人员姓名
* @param taskTel 评定人员手机号码
* @param daysRemaining 评定剩余天数
* @param status 任务状态
* @param isReturn 是否退回
* @param organIds 适用机构代码
* @param provincial 所在省
* @param city 所在市
* @param area 所在区域
* @param street 所在街道
* @param realName 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param taskName 评定人员姓名
* @param taskTel 评定人员手机号码
* @param daysRemaining 评定剩余天数
* @param status 任务状态
* @param isReturn 是否退回
*/
Page<TaskDistributionVO> taskDistributionList(Page<TaskDistributionVO> page, List<String> organIds, String provincial, String city,
String street, String realName, String certiCode, String taskName, String taskTel,
......@@ -46,4 +47,6 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);
List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader);
}
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java
View file @ 63252d71
package com.hungraim.ltc.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
import com.hungraim.ltc.pojo.vo.assessment.AprEmpVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
......@@ -52,7 +52,7 @@ public interface TaskService {
*/
List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
List<ChAprEmp> aprEmpList(Integer organId);
List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader);
void addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark);
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java
View file @ 63252d71
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.dao.*;
import com.hungraim.ltc.pojo.entity.assessment.*;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
import com.hungraim.ltc.pojo.vo.assessment.AprEmpVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskGroupVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
......@@ -60,13 +61,8 @@ public class TaskServiceImpl implements TaskService {
}
@Override
public List<ChAprEmp> aprEmpList(Integer organId) {
QueryWrapper<ChAprEmp> queryWrapper = new QueryWrapper<ChAprEmp>();
queryWrapper.eq("IS_LOCK", 0);
if (organId != null) {
queryWrapper.eq("apr_organ_id", organId);
}
return aprEmpMapper.selectList(queryWrapper);
public List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader) {
return taskMapper.aprEmpList(organName, name, tel, groupLeader);
}
@Override
......
assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml
View file @ 63252d71
......@@ -114,7 +114,7 @@
LEFT JOIN CH_DISABLE_RISK_LEVEL lev ON report.DISABLE_LEVEL_ID = lev.DISA_RISK_LEVEL_ID
<where>
<if test="name != null and name == ''">
and info.REAL_NAME = #{name}
and info.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%')
</if>
<if test="certiCode != null and certiCode == ''">
and info.CERTI_CODE = #{certiCode}
......@@ -146,7 +146,7 @@
LEFT JOIN CH_APR_ORGAN emp_organ on emp.apr_organ_id = emp_organ.apr_organ_id
<where>
<if test="name != null and name == ''">
and emp.REAL_NAME = #{name}
and emp.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%')
</if>
<if test="certiCode != null and certiCode == ''">
and emp.CERTI_CODE = #{certiCode}
......@@ -157,4 +157,38 @@
</where>
</select>
<select id="aprEmpList" resultType="com.hungraim.ltc.pojo.vo.assessment.AprEmpVO">
SELECT emp.emp_id empId,
srvOrgan.srv_organ_name srvOrganName,
organ.organ_code organCode,
organ.district_provincial districtProvincial,
organ.district_city districtCity,
organ.district_area districtArea,
organ.organ_name orgaName,
organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
emp.real_name realName,
emp.gender gender,
emp.AGE age,
emp.certi_code certiCode,
emp.tel tel,
emp.Group_leader groupLeader
FROM ch_apr_emp emp
LEFT JOIN ch_apr_organ organ ON emp.apr_organ_id = organ.apr_organ_id
LEFT JOIN ch_srv_organ srvOrgan ON organ.organ_id = srvOrgan.srv_organ_id
<where>
<if test="organName != null and organName == ''">
and organ.organ_name like CONCAT(CONCAT('%',#{organName}) ,'%')
</if>
<if test="name != null and name == ''">
and emp.real_name like CONCAT(CONCAT('%',#{name}) ,'%')
</if>
<if test="tel != null and tel == ''">
and emp.tel = #{tel}
</if>
<if test="groupLeader != null and groupLeader == ''">
and emp.Group_leader = #{groupLeader}
</if>
</where>
</select>
</mapper>
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/AprEmpVO.java 0 → 100644
View file @ 63252d71
package com.hungraim.ltc.pojo.vo.assessment;
import lombok.Data;
/**
* 评定报告录入列表
*/
@Data
public class AprEmpVO {
//评定人员id
private String empId;
//适用机构
private String srvOrganName;
//机构代码
private String organCode;
//所在省市区
private String districtProvincial;
private String districtCity;
private String districtArea;
//评定机构名称
private String organName;
//统一社会信用代码
private String unifiedSocialCreditCode;
//评定人员名称
private String realName;
//评定人员性别
private String gender;
//评定人员年龄
private String age;
//评定人员身份证号码
private String certiCode;
//评定人员手机号码
private String tel;
//是否组长0组长，1非组长
private Integer groupLeader;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment