Commit e3da208c authored by zhangch's avatar zhangch

个人照护方案服务配置列表接口修改,实体类生成

parent ec84f5c5
package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPushHis;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Repository
@Mapper
public interface ChAprTaskPushHisMapper extends BaseMapper<ChAprTaskPushHis> {
}
\ No newline at end of file
package com.hungraim.ltc.pojo.entity.assessment;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* CH_APR_TASK_PUSH_HIS
* @author
*/
@Data
@TableName("CH_APR_TASK_PUSH_HIS")
@KeySequence("SEQ_CH_APR_TASK_PUSH_HIS")
public class ChAprTaskPushHis implements Serializable {
/**
* 任务推送ID(年月日+串码6)
*/
@TableId(type = IdType.INPUT)
private Long hisTaskPushId;
/**
* 任务池ID
*/
private String taskPoolId;
/**
* 日期
*/
private Date time;
/**
* 评定起点ID
*/
private Long evaluateAddressId;
/**
* 组号
*/
private String groupNumber;
/**
* 顺序号
*/
private Long orderNumber;
/**
* 任务ID
*/
private Long taskId;
/**
* 计划到达时间
*/
private Date plannedArrivalTime;
/**
* 计划离开时间
*/
private Date plannedDepartureTime;
/**
* 距离前站公里数
*/
private BigDecimal distanceStationKilometers;
/**
* 距离前站行驶时间(建议单位是分钟)
*/
private BigDecimal distanceStationTravelTime;
/**
* 车次总距离
*/
private BigDecimal totalDistance;
/**
* 总时长
*/
private BigDecimal lengthOfTime;
/**
* 报送主键ID
*/
private Long sendId;
/**
* 组长ID
*/
private Long empId;
/**
* 状态(0未分配,1已分配, 空 ,2拒绝(重新分配),3 已接受 ,4 已完成,5失效,6拒绝(中止),7拒绝(终止))
*/
private Short status;
/**
* 首次操作时间
*/
private Date fcd;
/**
* 首次操作人
*/
private Long fcu;
/**
* 末次操作时间
*/
private Date lcd;
/**
* 末次操作人
*/
private Long lcu;
/**
* 车次的行程起点地址
*/
private String routeStartLocation;
/**
* 车次的行程终点地址
*/
private String routeEndLocation;
/**
* 车次的行程出发时间
*/
private Date routeStartTime;
/**
* 车次的行程结束时间
*/
private Date routeEndTime;
/**
* 停靠点地址
*/
private String stopLocation;
/**
* 上门服务日期,遇到节假日分配到工作第一天
*/
private Date setoutDate;
/**
* 任务组id号
*/
private String taskGroupNo;
/**
* 来源(0:定时任务 1手动)
*/
private Short dataFrom;
/**
* 接受时间
*/
private Date acceptTime;
/**
* 接受人
*/
private Long acceptEmp;
/**
* 接受机构
*/
private Long acceptOrganName;
/**
* 拒绝原因
*/
private Short refuseReason;
/**
* 拒绝备注
*/
private String refuseRemark;
/**
* 拒绝时间
*/
private Date refuseTime;
/**
* 拒绝人
*/
private Long refuseEmp;
/**
* 拒绝机构
*/
private Long refuseOrganName;
/**
* 分配时间
*/
private Date assignTime;
/**
* 分配人
*/
private Long assignEmp;
/**
* 分配机构
*/
private Long assignOrganName;
/**
* 完成时间
*/
private Date finishTime;
/**
* 完成人
*/
private Long finishEmp;
/**
* 完成机构
*/
private Long finishOrganName;
/**
* 是否手动分组 (0 是,1 否)
*/
private Short isManual;
/**
* 任务预约时间
*/
private Date taskAppointmentDate;
/**
* 预约备注
*/
private String appointmentRemark;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
......@@ -58,18 +58,20 @@ public class SrvProgramController {
*
* @param pageNum 页码
* @param pageSize 每页大小
* @param disabInfoId 失能人员id
* @param srvOrganId 服务机构id
* @return 返回个人照护方案列表
*/
@RequestMapping("/programSetList")
public Result getProgramSetList(Integer pageNum, Integer pageSize) {
if (pageNum == null || pageNum < 1) {
public Result getProgramSetList(Integer pageNum, Integer pageSize, Long disabInfoId, Long srvOrganId) {
if (pageNum == null || pageNum < 1 || disabInfoId == null || disabInfoId == 0 || srvOrganId == null || srvOrganId == 0) {
return Result.failed("参数错误");
}
if (pageSize == null || pageSize < 1) {
pageSize = 10;
}
Page<ProgramSetListVo> page = new Page<>(pageNum, pageSize);
page = srvProgramService.getProgramSetList(page);
page = srvProgramService.getProgramSetList(page, disabInfoId, srvOrganId);
return Result.success(page);
}
}
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
import com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Mapper
......@@ -16,7 +17,9 @@ public interface ChSrvProgramMapper extends BaseMapper<ChSrvProgram> {
* 个人照护方案列表查询
*
* @param page 分页参数
* @param disabInfoId 失能人员id
* @param srvOrganId 服务机构id
* @return 返回个人照护方案列表
*/
Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page);
Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page, @Param("disabInfoId") Long disabInfoId, @Param("srvOrganId") Long srvOrganId);
}
\ No newline at end of file
......@@ -21,7 +21,9 @@ public interface SrvProgramService {
* 个人照护方案列表查询
*
* @param page 分页参数
* @param disabInfoId 失能人员id
* @param srvOrganId 服务机构id
* @return 返回个人照护方案列表
*/
Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page);
Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page, Long disabInfoId, Long srvOrganId);
}
......@@ -2,7 +2,6 @@ package com.hungraim.ltc.governance.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.governance.dao.ChSrvProgramMapper;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
import com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo;
import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
import com.hungraim.ltc.governance.dao.ChSrvSendMapper;
......@@ -26,7 +25,7 @@ public class SrvProgramServiceImpl implements SrvProgramService {
}
@Override
public Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page) {
return chSrvProgramMapper.getProgramSetList(page);
public Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page, Long disabInfoId, Long srvOrganId) {
return chSrvProgramMapper.getProgramSetList(page, disabInfoId, srvOrganId);
}
}
......@@ -3,10 +3,34 @@
<mapper namespace="com.hungraim.ltc.governance.dao.ChSrvProgramMapper">
<select id="getProgramSetList" resultType="com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo">
SELECT *
SELECT
T1.PROGRAM_ID programId,
T1.SRV_ORGAN_ID srvOrganId,
T1.DISAB_INFO_ID disabInfoId,
T5.DISTRICT_PROVINCIAL districtProvincial,
T5.DISTRICT_CITY districtCity,
T2.REAL_NAME realName,
T2.TEL realTel,
T2.BIRTHDAY birthday,
T2.GENDER gender,
T2.ACPT_PROVINCIAL acptProvincial,
T2.ACPT_CITY acptCity,
T2.ACPT_AREA acptArea,
T2.ACPT_STREET acptStreet,
T2.ACPT_ADDRESS acptAddress,
T6.DISABLE_LEVEL_NAME realLevel,
T4.FINISH_TIME assessDate,
T7.SRV_MODE_NAME svrModelName,
T5.SRV_ORGAN_NAME svrOrganName,
T1.PROG_STATUS progStatus,
T1.EFF_TIME effTime
FROM CH_SRV_PROGRAM T1
INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
LEFT JOIN CH_FND_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.SRV_MODE_ID
LEFT JOIN CH_APR_REPORT T3 ON T2.LAST_TASK_ID = T3.TASK_ID
LEFT JOIN CH_CFG_SRV_DISABLE_LEVEL T6 ON T3.DISABLE_LEVEL_ID = T6.DISABLE_LEVEL_ID
LEFT JOIN CH_APR_TASK T4 ON T3.TASK_ID = T4.TASK_ID
LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
WHERE T1.DISAB_INFO_ID = #{disabInfoId} AND T1.SRV_ORGAN_ID = #{srvOrganId}
</select>
</mapper>
\ No newline at end of file
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