Skip to content

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

分配历史信息列表

parent 5b5387f6
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 26 deletions
assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
View file @ 83166680
...@@ -207,6 +207,15 @@ public class TaskController { ...@@ -207,6 +207,15 @@ public class TaskController {
} }
/** /**
* 分配历史信息列表
*/
@RequestMapping("/allotTaskHisList")
public Result<List<AllotTaskHisVO>> allotTaskHisList() {
List<AllotTaskHisVO> list = taskService.allotTaskHisList();
return Result.success(list);
}
/**
* 评定任务分组管理列表 * 评定任务分组管理列表
* *
* @param name 评定人员姓名 * @param name 评定人员姓名
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java
View file @ 83166680
...@@ -52,4 +52,6 @@ public interface TaskMapper extends BaseMapper<ChAprTask> { ...@@ -52,4 +52,6 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber); List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber);
TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId); TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
List<AllotTaskHisVO> allotTaskHisList();
} }
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java
View file @ 83166680
...@@ -70,4 +70,6 @@ public interface TaskService { ...@@ -70,4 +70,6 @@ public interface TaskService {
Result<Object> taskGroupByGroup(String groupNumber, Integer status); Result<Object> taskGroupByGroup(String groupNumber, Integer status);
TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId); TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
List<AllotTaskHisVO> allotTaskHisList();
} }
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java
View file @ 83166680
...@@ -240,4 +240,9 @@ public class TaskServiceImpl implements TaskService { ...@@ -240,4 +240,9 @@ public class TaskServiceImpl implements TaskService {
public TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId) { public TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId) {
return taskMapper.taskGroupInfoListInfo(pushId); return taskMapper.taskGroupInfoListInfo(pushId);
} }
@Override
public List<AllotTaskHisVO> allotTaskHisList() {
return taskMapper.allotTaskHisList();
}
} }
\ No newline at end of file
assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml
View file @ 83166680
...@@ -242,18 +242,18 @@ ...@@ -242,18 +242,18 @@
disable.real_name realName, disable.real_name realName,
disable.gender gender, disable.gender gender,
disable.birthday birthday, disable.birthday birthday,
disable.certi_code certiCode, disable.certi_code certiCode,
push.Planned_arrival_time plannedArrivalTime, push.Planned_arrival_time plannedArrivalTime,
push.Planned_departure_time plannedDepartureTime, push.Planned_departure_time plannedDepartureTime,
push.Distance_station_kilometers distanceStationKilometers, push.Distance_station_kilometers distanceStationKilometers,
push.Distance_station_travel_time distanceStationTravelTime, push.Distance_station_travel_time distanceStationTravelTime,
push.Total_distance totalDistance, push.Total_distance totalDistance,
push.Length_of_time lengthOfTime, push.Length_of_time lengthOfTime,
emp.real_name empRealName, emp.real_name empRealName,
emp.certi_code empCertiCode, emp.certi_code empCertiCode,
push.status status, push.status status,
push.Refuse_reason refuseReason,/*拒绝原因*/ push.Refuse_reason refuseReason,/*拒绝原因*/
push.Refuse_remark remark/*备注*/ push.Refuse_remark remark/*备注*/
from ch_apr_task_push push from ch_apr_task_push push
left join ch_apr_task task on push.task_id = task.task_id left join ch_apr_task task on push.task_id = task.task_id
left join CH_FND_ORGAN organ on organ.organ_id = task.organ_id left join CH_FND_ORGAN organ on organ.organ_id = task.organ_id
...@@ -278,20 +278,20 @@ ...@@ -278,20 +278,20 @@
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.adress_district_provincial = dis.DISTRICT_CODE) adressDistrictProvincial, (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.adress_district_provincial = dis.DISTRICT_CODE) adressDistrictProvincial,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.adress_district_city = dis.DISTRICT_CODE) adressDistrictCity, (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.adress_district_city = dis.DISTRICT_CODE) adressDistrictCity,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.Adress_district_code = dis.DISTRICT_CODE) adressDistrictCode, (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.Adress_district_code = dis.DISTRICT_CODE) adressDistrictCode,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.ACPT_PROVINCIAL = dis.DISTRICT_CODE) acptProvincial, (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.ACPT_PROVINCIAL = dis.DISTRICT_CODE) acptProvincial,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.ACPT_CITY = dis.DISTRICT_CODE) acptCity, (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.ACPT_CITY = dis.DISTRICT_CODE) acptCity,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.ACPT_AREA = dis.DISTRICT_CODE) acptArea, (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.ACPT_AREA = dis.DISTRICT_CODE) acptArea,
task.eff_time effTime, task.eff_time effTime,
task.Last_apr_date lastAprDate, task.Last_apr_date lastAprDate,
emp.real_name empRealName, emp.real_name empRealName,
emp.certi_code empCertiCode, emp.certi_code empCertiCode,
emp.tel empTel, emp.tel empTel,
push.accept_time acceptTime, push.accept_time acceptTime,
push.refuse_reason refuseReason, push.refuse_reason refuseReason,
organ.organ_name refuseOrganName, organ.organ_name refuseOrganName,
push.refuse_emp refuseEmp, push.refuse_emp refuseEmp,
push.status status, push.status status,
push.refuse_remark refuseRemark push.refuse_remark refuseRemark
FROM ch_apr_task_push push FROM ch_apr_task_push push
LEFT JOIN ch_apr_task task ON push.TASK_ID = task.TASK_ID LEFT JOIN ch_apr_task task ON push.TASK_ID = task.TASK_ID
left join ch_disable_info disable on task.disable_info_id = disable.disab_info_id left join ch_disable_info disable on task.disable_info_id = disable.disab_info_id
...@@ -300,4 +300,22 @@ ...@@ -300,4 +300,22 @@
where push.task_push_id = #{pushId} where push.task_push_id = #{pushId}
</select> </select>
<select id="allotTaskHisList" resultType="com.hungraim.ltc.pojo.vo.assessment.AllotTaskHisVO">
SELECT push.His_task_push_id hisTaskPushId,
push.task_id taskId,
push.assign_time assignTime,
push.group_number groupNumber,
push.time time,
organ.organ_name organName,
emp.real_name realName,
push.Refuse_time refuseTime,
push.status status,
push.Refuse_reason refuseReason,
push.Refuse_remark refuseRemark
FROM ch_apr_task_push_his push
LEFT JOIN ch_apr_task task ON push.TASK_ID = task.TASK_ID
left join ch_apr_organ organ on task.apr_organ_id = organ.apr_organ_id
LEFT JOIN ch_apr_emp emp on push.emp_id = emp.emp_id
</select>
</mapper> </mapper>
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/AllotTaskHisVO.java 0 → 100644
View file @ 83166680
package com.hungraim.ltc.pojo.vo.assessment;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 分配历史信息列表VO
*
* @author czz
*/
@Data
public class AllotTaskHisVO {
//分配历史id
private String hisTaskPushId;
//评定任务id
private String taskId;
//分配时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date assignTime;
//组号
private String groupNumber;
//预约日期
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date time;
//评定机构
private String organName;
//评定组长
private String realName;
//拒绝时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date refuseTime;
//状态
private String status;
//拒绝原因
private String refuseReason;
//备注
private String refuseRemark;
}
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