修改接口(查询待审核数量)

src/main/java/com/ccsens/yanyuan/api/UserGuideController.java

@@ -24,7 +24,7 @@ import java.util.List;
 /**
  * @author AUSU
  */
-@Api(tags = "受训连者（老人）" )
+@Api(tags = "用户引导页" )
 @Slf4j
 @RestController
 @RequestMapping("/guide")

src/main/java/com/ccsens/yanyuan/bean/vo/FamilyVo.java

@@ -53,5 +53,9 @@ public class FamilyVo {
     public static class NeedAuditNum {
         @ApiModelProperty("待审核数量")
         private Integer auditNum;
+        @ApiModelProperty("使用者姓名")
+        private String name;
+        @ApiModelProperty("用户zarit最新分数")
+        private Integer score;
     }
 }

src/main/java/com/ccsens/yanyuan/persist/dao/FamilyDao.java

@@ -31,4 +31,12 @@ public interface FamilyDao extends UserFamilyMapper {
      * @return 待审核数量
      */
     FamilyVo.NeedAuditNum queryAuditNum(@Param("projectId") Long projectId);
+
+    /**
+     * 查询使用者名字,家属最后一次zarit得分
+     * @param projectId 使用者的id
+     * @param userId 填写者id
+     * @return 使用者名字,家属最后一次zarit得分
+     */
+    FamilyVo.NeedAuditNum queryOtherInfo(@Param("projectId") Long projectId,@Param("userId") Long userId);
 }

src/main/java/com/ccsens/yanyuan/service/FamilyService.java

@@ -129,7 +129,10 @@ public class FamilyService implements IFamilyService {
 
     @Override
     public FamilyVo.NeedAuditNum queryAuditNum(FamilyDto.QueryFamily param, Long userId) {
-        return familyDao.queryAuditNum(param.getProjectId());
+        FamilyVo.NeedAuditNum auditNum = familyDao.queryAuditNum(param.getProjectId());
+        FamilyVo.NeedAuditNum otherInfo = familyDao.queryOtherInfo(param.getProjectId(),userId);
+        otherInfo.setAuditNum(auditNum.getAuditNum());
+        return otherInfo;
     }
 
     @Override

src/main/resources/mapper_dao/FamilyDao.xml

@@ -51,4 +51,19 @@
         AND r.relation_type = 2
         AND key_user_id = #{projectId}
     </select>
+    <select id="queryOtherInfo" resultType="com.ccsens.yanyuan.bean.vo.FamilyVo$NeedAuditNum">
+        SELECT
+            u.user_name,
+            c.zarit_state
+        FROM
+            u_user AS u
+        LEFT JOIN u_care AS c ON u.key_id = c.key_user_id
+        WHERE
+            u.rec_status = 0
+        AND u.`status` = 1
+        AND u.key_id = #{projectId}
+        AND c.record_user_id = #{userId}
+        ORDER BY c.create_at DESC
+        LIMIT 1
+    </select>
 </mapper>