Merge remote-tracking branch 'origin/master'

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvProgram.java

 package com.hungraim.ltc.pojo.entity.serviceManage;
 
+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;
 
@@ -8,10 +11,12 @@ import java.util.Date;
 
 @Data
 @TableName("CH_SRV_PROGRAM")
+@KeySequence("CH_SRV_PROGRAM_SQE")
 public class ChSrvProgram {
     /**
      * 服务方案ID
      */
+    @TableId(type = IdType.INPUT)
     private Integer programId;
 
     /**

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/governance/ChSrvSend.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvSend.java

-package com.hungraim.ltc.pojo.entity.governance;
+package com.hungraim.ltc.pojo.entity.serviceManage;
 
+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;
 
@@ -18,6 +20,7 @@ public class ChSrvSend implements Serializable {
     /**
      * 服务分配ID
      */
+    @TableId(type = IdType.INPUT)
     private Long srvSendId;
 
     /**

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/ProgramSetListVo.java

+package com.hungraim.ltc.pojo.vo.governance;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 列表页回显对象
+ */
+@Data
+public class ProgramSetListVo {
+
+    /**
+     * 服务分配ID
+     */
+    private Long programId;
+
+    /**
+     * 服务机构id
+     */
+    private Long srvOrganId;
+
+    /**
+     * 失能人员id
+     */
+    private Long disabInfoId;
+
+    /**
+     * 机构所在省
+     */
+    private String districtProvincial;
+
+    /**
+     * 机构所在市
+     */
+    private String districtCity;
+
+    /**
+     * 失能人员姓名
+     */
+    private String realName;
+
+    /**
+     * 失能人员手机号
+     */
+    private String realTel;
+
+    /**
+     * 失能人员生日
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthday;
+
+    /**
+     * 失能人员性别
+     */
+    private String gender;
+
+    /**
+     * 接收服务省市区
+     */
+    private String acptProvincial;
+    private String acptCity;
+    private String acptArea;
+    private String acptStreet;
+    private String acptAddress;
+
+    /**
+     * 失能等级
+     */
+    private String realLevel;
+
+    /**
+     * 评定完成日期
+     */
+    private Date assessDate;
+
+    /**
+     * 服务方式
+     */
+    private String svrModelName;
+
+    /**
+     * 护理机构名称
+     */
+    private String svrOrganName;
+
+    /**
+     * 服务方案状态  0：未生效、1：已生效、2：已终止
+     */
+    private Integer progStatus;
+
+    /**
+     * 创建时间(服务方案制定时间)
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date effTime;
+
+
+}

governance/src/main/java/com/hungraim/ltc/governance/controller/SrvProgramController.java

 package com.hungraim.ltc.governance.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo;
 import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
 import com.hungraim.ltc.governance.service.SrvProgramService;
 import com.hungraim.ltc.util.Result;
@@ -51,4 +52,24 @@ public class SrvProgramController {
         page = srvProgramService.getProgramList(page, srvOrganId, realName, realTel, programStatus);
         return Result.success(page);
     }
+
+    /**
+     * 个人照护方案列表查询
+     *
+     * @param pageNum  页码
+     * @param pageSize 每页大小
+     * @return 返回个人照护方案列表
+     */
+    @RequestMapping("/programSetList")
+    public Result getProgramSetList(Integer pageNum, Integer pageSize) {
+        if (pageNum == null || pageNum < 1) {
+            return Result.failed("参数错误");
+        }
+        if (pageSize == null || pageSize < 1) {
+            pageSize = 10;
+        }
+        Page<ProgramSetListVo> page = new Page<>(pageNum, pageSize);
+        page = srvProgramService.getProgramSetList(page);
+        return Result.success(page);
+    }
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/ChSrvProgramMapper.java

+package com.hungraim.ltc.governance.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChSrvProgramMapper extends BaseMapper<ChSrvProgram> {
+
+    /**
+     * 个人照护方案列表查询
+     *
+     * @param page 分页参数
+     * @return 返回个人照护方案列表
+     */
+    Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page);
+}
\ No newline at end of file

governance/src/main/java/com/hungraim/ltc/governance/dao/ChSrvSendMapper.java

@@ -3,8 +3,8 @@ package com.hungraim.ltc.governance.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
 import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
-import com.hungraim.ltc.pojo.entity.governance.ChSrvSend;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -22,4 +22,5 @@ public interface ChSrvSendMapper extends BaseMapper<ChSrvSend> {
      * @return 返回列表
      */
     Page<SvrProgramListVo> selectProgramList(Page<SvrProgramListVo> page, @Param("srvOrganId") Long srvOrganId, @Param("realName") String realName, @Param("realTel") String realTel, @Param("programStatus") String programStatus);
+
 }
\ No newline at end of file

governance/src/main/java/com/hungraim/ltc/governance/service/SrvProgramService.java

 package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo;
 import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
 
 public interface SrvProgramService {
@@ -15,4 +16,12 @@ public interface SrvProgramService {
      * @return 返回列表
      */
     Page<SvrProgramListVo> getProgramList(Page<SvrProgramListVo> page, Long srvOrganId, String realName, String realTel, String programStatus);
+
+    /**
+     * 个人照护方案列表查询
+     *
+     * @param page 分页参数
+     * @return 返回个人照护方案列表
+     */
+    Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page);
 }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvProgramServiceImpl.java

 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;
 import com.hungraim.ltc.governance.service.SrvProgramService;
@@ -14,8 +17,16 @@ public class SrvProgramServiceImpl implements SrvProgramService {
     @Autowired
     private ChSrvSendMapper chSrvSendMapper;
 
+    @Autowired
+    private ChSrvProgramMapper chSrvProgramMapper;
+
     @Override
     public Page<SvrProgramListVo> getProgramList(Page<SvrProgramListVo> page, Long srvOrganId, String realName, String realTel, String programStatus) {
         return chSrvSendMapper.selectProgramList(page, srvOrganId, realName, realTel, programStatus);
     }
+
+    @Override
+    public Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page) {
+        return chSrvProgramMapper.getProgramSetList(page);
+    }
 }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvProgramMapper.xml

+<?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.hungraim.ltc.governance.dao.ChSrvProgramMapper">
+
+    <select id="getProgramSetList" resultType="com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo">
+        SELECT *
+        FROM CH_SRV_PROGRAM T1
+                 INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
+                 LEFT JOIN CH_APR_REPORT T3 ON T2.LAST_TASK_ID = T3.TASK_ID
+                 LEFT JOIN CH_APR_TASK T4 ON T3.TASK_ID = T4.TASK_ID
+    </select>
+</mapper>
\ No newline at end of file

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvSendMapper.xml

 <?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.hungraim.ltc.governance.dao.ChSrvSendMapper">
-    <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.governance.ChSrvSend">
+    <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend">
         <result column="SRV_SEND_ID" jdbcType="DECIMAL" property="srvSendId"/>
         <result column="SRV_ORGAN_ID" jdbcType="DECIMAL" property="srvOrganId"/>
         <result column="SRV_MODE_ID" jdbcType="DECIMAL" property="srvModeId"/>