Merge remote-tracking branch 'origin/master'

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

@@ -17,6 +17,16 @@ public class SvrProgramListVo {
     private Long srvSendId;
 
     /**
+     * 服务机构id
+     */
+    private Long srvOrganId;
+
+    /**
+     * 失能人员id
+     */
+    private Long disabInfoId;
+
+    /**
      * 机构所在省
      */
     private String districtProvincial;

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

@@ -49,8 +49,6 @@ public class SrvProgramController {
         }
         Page<SvrProgramListVo> page = new Page<>(pageNum, pageSize);
         page = srvProgramService.getProgramList(page, srvOrganId, realName, realTel, programStatus);
-        long total = page.getTotal();
-        log.info("total:{}", total);
         return Result.success(page);
     }
 }

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

@@ -33,6 +33,8 @@
     </resultMap>
     <select id="selectProgramList" resultType="com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo">
         SELECT T1.SRV_SEND_ID srvSendId,
+        T1.SRV_ORGAN_ID srvOrganId,
+        T1.DISAB_INFO_ID disabInfoId,
         T2.DISTRICT_PROVINCIAL districtProvincial,
         T2.DISTRICT_CITY districtCity,
         T3.REAL_NAME realName,