merge

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/controller/PensionCommunityController.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.PensionCommunityDTO;
+import io.hmit.modules.serviceOrder.excel.PensionCommunityExcel;
+import io.hmit.modules.serviceOrder.service.PensionCommunityService;
+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-02-03
+ */
+@RestController
+@RequestMapping("serviceOrder/pensioncommunity")
+@Api(tags="社区表")
+public class PensionCommunityController {
+    @Autowired
+    private PensionCommunityService pensionCommunityService;
+
+    @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:pensioncommunity:page")
+    public Result<PageData<PensionCommunityDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<PensionCommunityDTO> page = pensionCommunityService.page(params);
+
+        return new Result<PageData<PensionCommunityDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @RequiresPermissions("serviceOrder:pensioncommunity:info")
+    public Result<PensionCommunityDTO> get(@PathVariable("id") Long id){
+        PensionCommunityDTO data = pensionCommunityService.get(id);
+
+        return new Result<PensionCommunityDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @RequiresPermissions("serviceOrder:pensioncommunity:save")
+    public Result save(@RequestBody PensionCommunityDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        pensionCommunityService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @RequiresPermissions("serviceOrder:pensioncommunity:update")
+    public Result update(@RequestBody PensionCommunityDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        pensionCommunityService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @RequiresPermissions("serviceOrder:pensioncommunity:delete")
+    public Result delete(@RequestBody Long[] ids){
+        //校验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        pensionCommunityService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @RequiresPermissions("serviceOrder:pensioncommunity:export")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PensionCommunityDTO> list = pensionCommunityService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, PensionCommunityExcel.class);
+    }
+
+}
\ No newline at end of file

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

+package io.hmit.modules.serviceOrder.dao;
+
+import io.hmit.common.dao.BaseDao;
+import io.hmit.modules.serviceOrder.entity.PensionCommunityEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 社区表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-02-03
+ */
+@Mapper
+public interface PensionCommunityDao extends BaseDao<PensionCommunityEntity> {
+	
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dto/PensionCommunityDTO.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-02-03
+ */
+@Data
+@ApiModel(value = "社区表")
+public class PensionCommunityDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "")
+	private Long id;
+
+	@ApiModelProperty(value = "")
+	private String name;
+
+	@ApiModelProperty(value = "创建者dept_id")
+	private Long deptId;
+
+	@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/dto/PensionOrderDTO.java

@@ -85,5 +85,10 @@ public class PensionOrderDTO implements Serializable {
 	@ApiModelProperty(value = "更新时间")
 	private Date updateDate;
 
+	@ApiModelProperty(value = "所属社区名称")
+	private String communityName;
+
+	@ApiModelProperty(value = "所属社区Id")
+	private Long communityId;
 
 }

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

@@ -28,8 +28,11 @@ public class PensionServiceDTO implements Serializable {
 	@ApiModelProperty(value = "服务名称")
 	private String name;
 
+	@ApiModelProperty(value = "服务内容介绍")
+	private String serviceContent;
+
 	@ApiModelProperty(value = "服务类型")
-	private Long serviceTypeId;
+	private Long serviceParentId;
 
 	@ApiModelProperty(value = "排序")
 	private Integer sort;

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

@@ -56,5 +56,22 @@ public class UserDTO implements Serializable {
 	@ApiModelProperty(value = "角色ID列表")
 	private List<Long> roleIdList;
 
+	@ApiModelProperty(value = "所属社区名称")
+	private String communityName;
+
+	@ApiModelProperty(value = "身体状态")
+	private String healthStatus;
+
+	@ApiModelProperty(value = "联系家属姓名")
+	private String familyMemberName;
+
+	@ApiModelProperty(value = "家属身份")
+	private String familyMemberRole;
+
+	@ApiModelProperty(value = "家属联系电话")
+	private String familyMemberTel;
+
+	@ApiModelProperty(value = "所属社区Id")
+	private Long communityId;
 
 }

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/entity/PensionCommunityEntity.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-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pension_community")
+public class PensionCommunityEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String name;
+    /**
+     * 创建者dept_id
+     */
+	private Long deptId;
+    /**
+     * 更新者
+     */
+	private Long updater;
+    /**
+     * 更新时间
+     */
+	private Date updateDate;
+}
\ No newline at end of file

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

@@ -59,7 +59,15 @@ public class PensionOrderEntity extends BaseEntity {
      * 备注
      */
 	private String remark;
-    /**
+	/**
+	 * 所属社区名称
+	 */
+	private String communityName;
+	/**
+	 * 所属社区Id
+	 */
+	private Long communityId;
+	/**
      * 接单人id
      */
 	private Long orderRecipientId;

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

@@ -27,7 +27,7 @@ public class PensionServiceEntity extends BaseEntity {
     /**
      * 服务类型
      */
-	private Long serviceTypeId;
+	private Long serviceParentId;
     /**
      * 排序
      */
@@ -72,4 +72,9 @@ public class PensionServiceEntity extends BaseEntity {
      * 更新时间
      */
 	private Date updateDate;
+	/**
+	 * 服务内容介绍
+	 */
+	private String serviceContent;
+
 }
\ No newline at end of file

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

@@ -55,4 +55,29 @@ public class UserEntity extends BaseEntity {
      * 详细地址
      */
 	private String address;
+	/**
+	 * 所属社区名称
+	 */
+	private String communityName;
+	/**
+	 * 所属社区Id
+	 */
+	private Long communityId;
+	/**
+	 * 身体状态
+	 */
+	private String healthStatus;
+	/**
+	 * 联系家属姓名
+	 */
+	private String familyMemberName;
+	/**
+	 * 家属身份
+	 */
+	private String familyMemberRole;
+	/**
+	 * 家属联系电话
+	 */
+	private String familyMemberTel;
+
 }

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/excel/PensionCommunityExcel.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-02-03
+ */
+@Data
+public class PensionCommunityExcel {
+    @Excel(name = "")
+    private Long id;
+    @Excel(name = "")
+    private String name;
+    @Excel(name = "创建者dept_id")
+    private Long deptId;
+    @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/excel/PensionOrderExcel.java

@@ -33,6 +33,10 @@ public class PensionOrderExcel {
     private String appointmentPhone;
     @Excel(name = "预约时间")
     private Date appointmentTime;
+    @Excel(name = "所属社区名称")
+    private String communityName;
+    @Excel(name = "所属社区Id")
+    private Long communityId;
     @Excel(name = "备注")
     private String remark;
     @Excel(name = "接单人id")

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

@@ -19,7 +19,7 @@ public class PensionServiceExcel {
     @Excel(name = "服务名称")
     private String name;
     @Excel(name = "服务类型")
-    private Long serviceTypeId;
+    private Long serviceParentId;
     @Excel(name = "排序")
     private Integer sort;
     @Excel(name = "首页图标地址")
@@ -47,4 +47,7 @@ public class PensionServiceExcel {
     @Excel(name = "更新时间")
     private Date updateDate;
 
+    @Excel(name = "服务内容介绍")
+    private String serviceContent;
+
 }
\ No newline at end of file

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

@@ -33,5 +33,17 @@ public class UserExcel {
     private String addressArea;
     @Excel(name = "详细地址")
     private String address;
+    @Excel(name =  "所属社区名称")
+    private String communityName;
+    @Excel(name =  "身体状态")
+    private String healthStatus;
+    @Excel(name =  "联系家属姓名")
+    private String familyMemberName;
+    @Excel(name =  "家属身份")
+    private String familyMemberRole;
+    @Excel(name =  "家属联系电话")
+    private String familyMemberTel;
+    @Excel(name =  "所属社区Id")
+    private Long communityId;
 
 }
\ No newline at end of file

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

+package io.hmit.modules.serviceOrder.service;
+
+import io.hmit.common.service.CrudService;
+import io.hmit.modules.serviceOrder.dto.PensionCommunityDTO;
+import io.hmit.modules.serviceOrder.entity.PensionCommunityEntity;
+
+/**
+ * 社区表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-02-03
+ */
+public interface PensionCommunityService extends CrudService<PensionCommunityEntity, PensionCommunityDTO> {
+
+}
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionCommunityServiceImpl.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.PensionCommunityDao;
+import io.hmit.modules.serviceOrder.dto.PensionCommunityDTO;
+import io.hmit.modules.serviceOrder.entity.PensionCommunityEntity;
+import io.hmit.modules.serviceOrder.service.PensionCommunityService;
+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-02-03
+ */
+@Service
+public class PensionCommunityServiceImpl extends CrudServiceImpl<PensionCommunityDao, PensionCommunityEntity, PensionCommunityDTO> implements PensionCommunityService {
+
+    @Override
+    public QueryWrapper<PensionCommunityEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<PensionCommunityEntity> 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/PensionCommunityDao.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.PensionCommunityDao">
+
+    <resultMap type="io.hmit.modules.serviceOrder.entity.PensionCommunityEntity" id="pensionCommunityMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="deptId" column="dept_id"/>
+        <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/dto/UserInfoDTO.java

@@ -43,5 +43,19 @@ public class UserInfoDTO {
     @ApiModelProperty(value = "详细地址")
     private String address;
 
+    @ApiModelProperty(value = "所属社区名称")
+    private String communityName;
+
+    @ApiModelProperty(value = "身体状态")
+    private String healthStatus;
+
+    @ApiModelProperty(value = "联系家属姓名")
+    private String familyMemberName;
+
+    @ApiModelProperty(value = "家属身份")
+    private String familyMemberRole;
+
+    @ApiModelProperty(value = "家属联系电话")
+    private String familyMemberTel;
 
 }

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

@@ -62,5 +62,29 @@ public class UserEntity implements Serializable {
      * 详细地址
      */
     private String address;
+    /**
+     * 所属社区名称
+     */
+    private String communityName;
+    /**
+     * 身体状态
+     */
+    private String healthStatus;
+    /**
+     * 联系家属姓名
+     */
+    private String familyMemberName;
+    /**
+     * 家属身份
+     */
+    private String familyMemberRole;
+    /**
+     * 家属联系电话
+     */
+    private String familyMemberTel;
+    /**
+     * 所属社区Id
+     */
+    private Long communityId;
 
 }

hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionCommunityController.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.PensionCommunityDTO;
+import io.hmit.modules.serviceOrder.service.PensionCommunityService;
+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 javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 社区表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-02-03
+ */
+@RestController
+@RequestMapping("serviceOrder/pensioncommunity")
+@Api(tags="社区表")
+public class PensionCommunityController {
+    @Autowired
+    private PensionCommunityService pensionCommunityService;
+
+    @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<PensionCommunityDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<PensionCommunityDTO> page = pensionCommunityService.page(params);
+
+        return new Result<PageData<PensionCommunityDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    public Result<PensionCommunityDTO> get(@PathVariable("id") Long id){
+        PensionCommunityDTO data = pensionCommunityService.get(id);
+
+        return new Result<PensionCommunityDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    public Result save(@RequestBody PensionCommunityDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        pensionCommunityService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    public Result update(@RequestBody PensionCommunityDTO dto){
+        //校验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        pensionCommunityService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    public Result delete(@RequestBody Long[] ids){
+        //校验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        pensionCommunityService.delete(ids);
+
+        return new Result();
+    }
+
+}
\ No newline at end of file

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

@@ -104,7 +104,7 @@ public class PensionServiceController {
     public Result<PensionServiceDTO> getByServiceTypeId(@PathVariable("serviceTypeId") Long serviceTypeId){
         List<PensionServiceDTO> data =  baseMapper.selectList(
                 new QueryWrapper<PensionServiceDTO>().lambda()
-                        .eq(PensionServiceDTO::getServiceTypeId,serviceTypeId));
+                        .eq(PensionServiceDTO::getServiceParentId,serviceTypeId));
 
         return new Result<PensionServiceDTO>().ok(data.get(0));
     }

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

+package io.hmit.modules.serviceOrder.dao;
+
+import io.hmit.common.dao.BaseDao;
+import io.hmit.modules.serviceOrder.entity.PensionCommunityEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 社区表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-02-03
+ */
+@Mapper
+public interface PensionCommunityDao extends BaseDao<PensionCommunityEntity> {
+	
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionCommunityDTO.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-02-03
+ */
+@Data
+@ApiModel(value = "社区表")
+public class PensionCommunityDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "")
+	private Long id;
+
+	@ApiModelProperty(value = "")
+	private String name;
+
+	@ApiModelProperty(value = "创建者dept_id")
+	private Long deptId;
+
+	@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/dto/PensionOrderDTO.java

@@ -94,6 +94,12 @@ public class PensionOrderDTO implements Serializable {
 	@ApiModelProperty(value = "封面")
 	private String icon;
 
+	@ApiModelProperty(value = "所属社区名称")
+	private String communityName;
+
+	@ApiModelProperty(value = "所属社区Id")
+	private Long communityId;
+
 	public PensionOrderDTO assemblePensionOrder(ReservationDTO reservationDTO, UserEntity user){
 		PensionOrderDTO pensionOrder = new PensionOrderDTO();
 		pensionOrder.setOrderNum("");

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

@@ -28,6 +28,9 @@ public class PensionServiceDTO implements Serializable {
 	@ApiModelProperty(value = "服务父类id")
 	private Long pid;
 
+	@ApiModelProperty(value = "服务内容介绍")
+	private String serviceContent;
+
 	@ApiModelProperty(value = "排序")
 	private Integer sort;
 

hmit-api/src/main/java/io/hmit/modules/serviceOrder/entity/PensionCommunityEntity.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-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pension_community")
+public class PensionCommunityEntity extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String name;
+    /**
+     * 创建者dept_id
+     */
+	private Long deptId;
+    /**
+     * 更新者
+     */
+	private Long updater;
+    /**
+     * 更新时间
+     */
+	private Date updateDate;
+}
\ No newline at end of file

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

@@ -99,4 +99,14 @@ public class PensionOrderEntity extends BaseEntity {
      * 更新时间
      */
 	private Date updateDate;
+
+	/**
+	 * 所属社区名称
+	 */
+	private String communityName;
+	/**
+	 * 所属社区Id
+	 */
+	private Long communityId;
+
 }

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

@@ -30,6 +30,7 @@ public class PensionServiceEntity extends BaseEntity {
      * 服务父类id
      */
 	private Long pid;
+
     /**
      * 排序
      */
@@ -78,4 +79,9 @@ public class PensionServiceEntity extends BaseEntity {
      * 更新时间
      */
 	private Date updateDate;
+	/**
+	 * 服务内容介绍
+	 */
+	private String serviceContent;
+
 }

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

+package io.hmit.modules.serviceOrder.service;
+
+import io.hmit.common.service.CrudService;
+import io.hmit.modules.serviceOrder.dto.PensionCommunityDTO;
+import io.hmit.modules.serviceOrder.entity.PensionCommunityEntity;
+
+/**
+ * 社区表
+ *
+ * @author zsh 408538940@qq.com
+ * @since 1.0.0 2021-02-03
+ */
+public interface PensionCommunityService extends CrudService<PensionCommunityEntity, PensionCommunityDTO> {
+
+}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionCommunityServiceImpl.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.PensionCommunityDao;
+import io.hmit.modules.serviceOrder.dto.PensionCommunityDTO;
+import io.hmit.modules.serviceOrder.entity.PensionCommunityEntity;
+import io.hmit.modules.serviceOrder.service.PensionCommunityService;
+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-02-03
+ */
+@Service
+public class PensionCommunityServiceImpl extends CrudServiceImpl<PensionCommunityDao, PensionCommunityEntity, PensionCommunityDTO> implements PensionCommunityService {
+
+    @Override
+    public QueryWrapper<PensionCommunityEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<PensionCommunityEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}
\ No newline at end of file

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

@@ -91,7 +91,7 @@ public class PensionServiceTypeServiceImpl extends CrudServiceImpl<PensionServic
 
 /*
         for (PensionServiceEntity pensionService:pensionServices) {
-            PensionServiceTypeDTO pensionServiceTypeDTO = get(pensionService.getServiceTypeId());
+            PensionServiceTypeDTO pensionServiceTypeDTO = get(pensionService.getServiceParentId());
             resultList.add(pensionServiceTypeDTO);
         }
 */

hmit-api/src/main/resources/mapper/serviceOrder/PensionCommunityDao.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.PensionCommunityDao">
+
+    <resultMap type="io.hmit.modules.serviceOrder.entity.PensionCommunityEntity" id="pensionCommunityMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="deptId" column="dept_id"/>
+        <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