分配历史信息列表

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

@@ -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      评定人员姓名

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java

@@ -52,4 +52,6 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
     List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber);
 
     TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
+
+    List<AllotTaskHisVO> allotTaskHisList();
 }

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

@@ -70,4 +70,6 @@ public interface TaskService {
     Result<Object> taskGroupByGroup(String groupNumber, Integer status);
 
     TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
+
+    List<AllotTaskHisVO> allotTaskHisList();
 }

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -240,4 +240,9 @@ public class TaskServiceImpl implements TaskService {
     public TaskGroupInfoListInfoVO taskGroupInfoListInfo(String 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

@@ -300,4 +300,22 @@
         where push.task_push_id = #{pushId}
     </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>
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/AllotTaskHisVO.java

+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;
+}