1.用户个人信息接口实体类优化

2.新增“老人与家属的关联”相关类

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOldFamilyController.java

+package io.hmit.modules.serviceOrder.controller;
+
+import io.hmit.common.annotation.LogOperation;
+import io.hmit.common.constant.Constant;
+import io.hmit.common.page.PageData;
+import io.hmit.common.utils.ExcelUtils;
+import io.hmit.common.utils.Result;
+import io.hmit.common.validator.AssertUtils;
+import io.hmit.common.validator.ValidatorUtils;
+import io.hmit.common.validator.group.AddGroup;
+import io.hmit.common.validator.group.DefaultGroup;
+import io.hmit.common.validator.group.UpdateGroup;
+import io.hmit.modules.serviceOrder.dto.PensionOldFamilyDTO;
+import io.hmit.modules.serviceOrder.excel.PensionOldFamilyExcel;
+import io.hmit.modules.serviceOrder.service.PensionOldFamilyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@RestController
+@RequestMapping("serviceOrder/pensionoldfamily")
+@Api(tags="老人与家属的关联表")
+public class PensionOldFamilyController {
+    @Autowired
+    private PensionOldFamilyService pensionOldFamilyService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
+    })
+    @RequiresPermissions("serviceOrder:pensionoldfamily:page")
+    public Result<PageData<PensionOldFamilyDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<PensionOldFamilyDTO> page = pensionOldFamilyService.page(params);
+
+        return new Result<PageData<PensionOldFamilyDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @RequiresPermissions("serviceOrder:pensionoldfamily:info")
+    public Result<PensionOldFamilyDTO> get(@PathVariable("id") Long id){
+        PensionOldFamilyDTO data = pensionOldFamilyService.get(id);
+
+        return new Result<PensionOldFamilyDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @RequiresPermissions("serviceOrder:pensionoldfamily:save")
+    public Result save(@RequestBody PensionOldFamilyDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        pensionOldFamilyService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @RequiresPermissions("serviceOrder:pensionoldfamily:update")
+    public Result update(@RequestBody PensionOldFamilyDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        pensionOldFamilyService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @RequiresPermissions("serviceOrder:pensionoldfamily:delete")
+    public Result delete(@RequestBody Long[] ids){
+        //校验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        pensionOldFamilyService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @RequiresPermissions("serviceOrder:pensionoldfamily:export")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PensionOldFamilyDTO> list = pensionOldFamilyService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, PensionOldFamilyExcel.class);
+    }
+
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dao/PensionOldFamilyDao.java

+package io.hmit.modules.serviceOrder.dao;
+
+import io.hmit.common.dao.BaseDao;
+import io.hmit.modules.serviceOrder.entity.PensionOldFamilyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@Mapper
+public interface PensionOldFamilyDao extends BaseDao<PensionOldFamilyEntity> {
+	
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOldFamilyDTO.java

+package io.hmit.modules.serviceOrder.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@Data
+@ApiModel(value = "老人与家属的关联表")
+public class PensionOldFamilyDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "")
+	private Long id;
+
+	@ApiModelProperty(value = "老人id")
+	private Long oldId;
+
+	@ApiModelProperty(value = "老人与家属的关系")
+	private String parentRole;
+
+	@ApiModelProperty(value = "家属id")
+	private Long familyMemberId;
+
+	@ApiModelProperty(value = "家属与老人的关系")
+	private String familyMemberRole;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "创建者")
+	private Long creator;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createDate;
+
+	@ApiModelProperty(value = "更新者")
+	private Long updater;
+
+	@ApiModelProperty(value = "更新时间")
+	private Date updateDate;
+
+
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOldFamilyEntity.java

+package io.hmit.modules.serviceOrder.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.hmit.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pension_old_family")
+public class PensionOldFamilyEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 老人id
+     */
+	private Long oldId;
+    /**
+     * 老人与家属的关系
+     */
+	private String parentRole;
+    /**
+     * 家属id
+     */
+	private Long familyMemberId;
+    /**
+     * 家属与老人的关系
+     */
+	private String familyMemberRole;
+    /**
+     * 备注
+     */
+	private String remark;
+    /**
+     * 更新者
+     */
+	private Long updater;
+    /**
+     * 更新时间
+     */
+	private Date updateDate;
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/excel/PensionOldFamilyExcel.java

+package io.hmit.modules.serviceOrder.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@Data
+public class PensionOldFamilyExcel {
+    @Excel(name = "")
+    private Long id;
+    @Excel(name = "老人id")
+    private Long oldId;
+    @Excel(name = "老人与家属的关系")
+    private String parentRole;
+    @Excel(name = "家属id")
+    private Long familyMemberId;
+    @Excel(name = "家属与老人的关系")
+    private String familyMemberRole;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "创建者")
+    private Long creator;
+    @Excel(name = "创建时间")
+    private Date createDate;
+    @Excel(name = "更新者")
+    private Long updater;
+    @Excel(name = "更新时间")
+    private Date updateDate;
+
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/service/PensionOldFamilyService.java

+package io.hmit.modules.serviceOrder.service;
+
+import io.hmit.common.service.CrudService;
+import io.hmit.modules.serviceOrder.dto.PensionOldFamilyDTO;
+import io.hmit.modules.serviceOrder.entity.PensionOldFamilyEntity;
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+public interface PensionOldFamilyService extends CrudService<PensionOldFamilyEntity, PensionOldFamilyDTO> {
+
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOldFamilyServiceImpl.java

+package io.hmit.modules.serviceOrder.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.hmit.common.service.impl.CrudServiceImpl;
+import io.hmit.modules.serviceOrder.dao.PensionOldFamilyDao;
+import io.hmit.modules.serviceOrder.dto.PensionOldFamilyDTO;
+import io.hmit.modules.serviceOrder.entity.PensionOldFamilyEntity;
+import io.hmit.modules.serviceOrder.service.PensionOldFamilyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@Service
+public class PensionOldFamilyServiceImpl extends CrudServiceImpl<PensionOldFamilyDao, PensionOldFamilyEntity, PensionOldFamilyDTO> implements PensionOldFamilyService {
+
+    @Override
+    public QueryWrapper<PensionOldFamilyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<PensionOldFamilyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}
\ No newline at end of file

hmit-admin/src/main/resources/mapper/serviceOrder/PensionOldFamilyDao.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="io.hmit.modules.serviceOrder.dao.PensionOldFamilyDao">
+
+    <resultMap type="io.hmit.modules.serviceOrder.entity.PensionOldFamilyEntity" id="pensionOldFamilyMap">
+        <result property="id" column="id"/>
+        <result property="oldId" column="old_id"/>
+        <result property="parentRole" column="parent_role"/>
+        <result property="familyMemberId" column="family_member_id"/>
+        <result property="familyMemberRole" column="family_member_role"/>
+        <result property="remark" column="remark"/>
+        <result property="creator" column="creator"/>
+        <result property="createDate" column="create_date"/>
+        <result property="updater" column="updater"/>
+        <result property="updateDate" column="update_date"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

hmit-api/src/main/java/io/hmit/config/SwaggerConfig.java

@@ -27,7 +27,7 @@ public class SwaggerConfig {
     @Bean
     public Docket createRestApi() {
         return new Docket(DocumentationType.SWAGGER_2)
-                .host("byyl.zjhmit.com")
+//                .host("byyl.zjhmit.com")
                 .apiInfo(apiInfo())
                 .select()
                 //加了ApiOperation注解的类，才生成接口文档

hmit-api/src/main/java/io/hmit/controller/WeChatController.java

 package io.hmit.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.exception.WxErrorException;
@@ -22,15 +24,19 @@ import java.net.URLEncoder;
 @Slf4j
 @Controller
 @RequestMapping("/wechat")
+@Api(tags = "微信登录接口")
 public class WeChatController {
 
     @Autowired
     private WxMpService wxMpService;
 
     @GetMapping("/authorize")
-    public String authorize(/*@RequestParam("returnUrl") String returnUrl*/) {
-        String returnUrl = "http://byyl.zjhmit.com/hmit-api/api/login";
-        String url = "http://byyl.zjhmit.com/hmit-api/wechat/authcode";
+    @ApiOperation(value = "请求微信授权code", notes = "当returnUrl传入时，验证后将跳转到此路径")
+    public String authorize(@RequestParam(value = "returnUrl", required = false) String returnUrl) {
+        if (null == returnUrl) {
+            returnUrl = "https://byyl.zjhmit.com/hmit-api/api/login";
+        }
+        String url = "https://byyl.zjhmit.com/hmit-api/wechat/authcode";
         String redirectUrl = wxMpService.oauth2buildAuthorizationUrl(url, WxConsts.OAUTH2_SCOPE_BASE, URLEncoder.encode(returnUrl));
         log.info("【微信网页授权】获取code，redirectUrl={}", redirectUrl);
         return "redirect:" + redirectUrl;

hmit-api/src/main/java/io/hmit/dto/UserInfoDTO.java

 package io.hmit.dto;
 
+import io.hmit.modules.serviceOrder.dto.PensionOldFamilyDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author Eve
@@ -27,6 +29,11 @@ public class UserInfoDTO {
      */
     @ApiModelProperty(value = "手机号")
     private String mobile;
+    /**
+     * 性别
+     */
+    @ApiModelProperty(value = "性别")
+    private String gender;
     /**
      * 生日
      */
@@ -49,13 +56,7 @@ public class UserInfoDTO {
     @ApiModelProperty(value = "身体状态")
     private String healthStatus;
 
-    @ApiModelProperty(value = "联系家属姓名")
-    private String familyMemberName;
-
-    @ApiModelProperty(value = "家属身份")
-    private String familyMemberRole;
-
-    @ApiModelProperty(value = "家属联系电话")
-    private String familyMemberTel;
+    @ApiModelProperty(value = "家属信息")
+    private List<PensionOldFamilyDTO> pensionOldFamilyDTOList;
 
 }

hmit-api/src/main/java/io/hmit/entity/UserEntity.java

@@ -50,6 +50,10 @@ public class UserEntity implements Serializable {
      * 微信openid
      */
     private String openid;
+    /**
+     * 性别
+     */
+    private String gender;
     /**
      * 生日
      */
@@ -70,18 +74,18 @@ public class UserEntity implements Serializable {
      * 身体状态
      */
     private String healthStatus;
-    /**
-     * 联系家属姓名
-     */
-    private String familyMemberName;
-    /**
-     * 家属身份
-     */
-    private String familyMemberRole;
-    /**
-     * 家属联系电话
-     */
-    private String familyMemberTel;
+//    /**
+//     * 联系家属姓名
+//     */
+//    private String familyMemberName;
+//    /**
+//     * 家属身份
+//     */
+//    private String familyMemberRole;
+//    /**
+//     * 家属联系电话
+//     */
+//    private String familyMemberTel;
     /**
      * 所属社区Id
      */

hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOldFamilyController.java

+package io.hmit.modules.serviceOrder.controller;
+
+import io.hmit.common.constant.Constant;
+import io.hmit.common.page.PageData;
+import io.hmit.common.utils.Result;
+import io.hmit.common.validator.AssertUtils;
+import io.hmit.common.validator.ValidatorUtils;
+import io.hmit.common.validator.group.AddGroup;
+import io.hmit.common.validator.group.DefaultGroup;
+import io.hmit.common.validator.group.UpdateGroup;
+import io.hmit.modules.serviceOrder.dto.PensionOldFamilyDTO;
+import io.hmit.modules.serviceOrder.service.PensionOldFamilyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Map;
+
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@RestController
+@RequestMapping("serviceOrder/pensionoldfamily")
+@Api(tags="老人与家属的关联表")
+public class PensionOldFamilyController {
+    @Autowired
+    private PensionOldFamilyService pensionOldFamilyService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
+    })
+    public Result<PageData<PensionOldFamilyDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<PensionOldFamilyDTO> page = pensionOldFamilyService.page(params);
+
+        return new Result<PageData<PensionOldFamilyDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    public Result<PensionOldFamilyDTO> get(@PathVariable("id") Long id){
+        PensionOldFamilyDTO data = pensionOldFamilyService.get(id);
+
+        return new Result<PensionOldFamilyDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    public Result save(@RequestBody PensionOldFamilyDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        pensionOldFamilyService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    public Result update(@RequestBody PensionOldFamilyDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        pensionOldFamilyService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    public Result delete(@RequestBody Long[] ids){
+        //校验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        pensionOldFamilyService.delete(ids);
+
+        return new Result();
+    }
+
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dao/PensionOldFamilyDao.java

+package io.hmit.modules.serviceOrder.dao;
+
+import io.hmit.common.dao.BaseDao;
+import io.hmit.modules.serviceOrder.entity.PensionOldFamilyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@Mapper
+public interface PensionOldFamilyDao extends BaseDao<PensionOldFamilyEntity> {
+	
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOldFamilyDTO.java

+package io.hmit.modules.serviceOrder.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@Data
+@ApiModel(value = "老人与家属的关联表")
+public class PensionOldFamilyDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "")
+	private Long id;
+
+	@ApiModelProperty(value = "老人id")
+	private Long oldId;
+
+	@ApiModelProperty(value = "老人与家属的关系")
+	private String parentRole;
+
+	@ApiModelProperty(value = "家属id")
+	private Long familyMemberId;
+
+	@ApiModelProperty(value = "家属与老人的关系")
+	private String familyMemberRole;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "创建者")
+	private Long creator;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createDate;
+
+	@ApiModelProperty(value = "更新者")
+	private Long updater;
+
+	@ApiModelProperty(value = "更新时间")
+	private Date updateDate;
+
+
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOldFamilyEntity.java

+package io.hmit.modules.serviceOrder.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.hmit.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pension_old_family")
+public class PensionOldFamilyEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 老人id
+     */
+	private Long oldId;
+    /**
+     * 老人与家属的关系
+     */
+	private String parentRole;
+    /**
+     * 家属id
+     */
+	private Long familyMemberId;
+    /**
+     * 家属与老人的关系
+     */
+	private String familyMemberRole;
+    /**
+     * 备注
+     */
+	private String remark;
+    /**
+     * 更新者
+     */
+	private Long updater;
+    /**
+     * 更新时间
+     */
+	private Date updateDate;
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/PensionOldFamilyService.java

+package io.hmit.modules.serviceOrder.service;
+
+import io.hmit.common.service.CrudService;
+import io.hmit.modules.serviceOrder.dto.PensionOldFamilyDTO;
+import io.hmit.modules.serviceOrder.entity.PensionOldFamilyEntity;
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+public interface PensionOldFamilyService extends CrudService<PensionOldFamilyEntity, PensionOldFamilyDTO> {
+
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOldFamilyServiceImpl.java

+package io.hmit.modules.serviceOrder.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.hmit.common.service.impl.CrudServiceImpl;
+import io.hmit.modules.serviceOrder.dao.PensionOldFamilyDao;
+import io.hmit.modules.serviceOrder.dto.PensionOldFamilyDTO;
+import io.hmit.modules.serviceOrder.entity.PensionOldFamilyEntity;
+import io.hmit.modules.serviceOrder.service.PensionOldFamilyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 老人与家属的关联表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-03-18
+ */
+@Service
+public class PensionOldFamilyServiceImpl extends CrudServiceImpl<PensionOldFamilyDao, PensionOldFamilyEntity, PensionOldFamilyDTO> implements PensionOldFamilyService {
+
+    @Override
+    public QueryWrapper<PensionOldFamilyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<PensionOldFamilyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}
\ No newline at end of file

hmit-api/src/main/resources/mapper/serviceOrder/PensionOldFamilyDao.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="io.hmit.modules.serviceOrder.dao.PensionOldFamilyDao">
+
+    <resultMap type="io.hmit.modules.serviceOrder.entity.PensionOldFamilyEntity" id="pensionOldFamilyMap">
+        <result property="id" column="id"/>
+        <result property="oldId" column="old_id"/>
+        <result property="parentRole" column="parent_role"/>
+        <result property="familyMemberId" column="family_member_id"/>
+        <result property="familyMemberRole" column="family_member_role"/>
+        <result property="remark" column="remark"/>
+        <result property="creator" column="creator"/>
+        <result property="createDate" column="create_date"/>
+        <result property="updater" column="updater"/>
+        <result property="updateDate" column="update_date"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file