（1）、养老服务列表数据的维护管理

（2）、活动动态的维护 -- 富文本
（3）、老人，老人子女，志愿者，社区，第三方机构数据的维护 -- （导入，导出）
（4）、订单中心 - 【未接单订单，未完成订单，已完成订单，已取消订单，全部订单 】 查询筛选功能
（5）、角色数据维护
（6）、养老服务列表与角色关联

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

@@ -52,7 +52,8 @@ public class NewsController {
         @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")
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "status", value = "状态，0未审核，1审核通过，2审核不通过", paramType = "query", dataType="String")
     })
     @RequiresPermissions("serviceOrder:news:page")
     public Result<PageData<NewsDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){

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

@@ -47,6 +47,8 @@ public class NewsDTO implements Serializable {
 
 	@ApiModelProperty(value = "更新时间")
 	private Date updateDate;
+	@ApiModelProperty(value = "状态")
+	private Integer status;
 
 	// 附件
 	@TableField(exist = false)

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

@@ -2,6 +2,7 @@ package io.hmit.modules.serviceOrder.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.hmit.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -39,6 +40,9 @@ public class NewsEntity extends BaseEntity {
      * 更新者
      */
 	private Long updater;
+
+
+	private Integer status;
     /**
      * 更新时间
      */

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

@@ -23,9 +23,11 @@ public class NewsServiceImpl extends CrudServiceImpl<NewsDao, NewsEntity, NewsDT
     @Override
     public QueryWrapper<NewsEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get("id");
+        String status = (String)params.get("status");
 
         QueryWrapper<NewsEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+        wrapper.eq(StringUtils.isNotBlank(status), "status", status);
 
         return wrapper;
     }

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

@@ -118,6 +118,7 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
             if (pensionOrderEntity.getStatus() != 2 && pensionOrderEntity.getStatus() != 4) {
                 pensionOrderEntity.setStatus(3);
                 pensionOrderEntity.setStatusName(Constant.OrderStatus.CANCEL.getMessage());
+                pensionOrderEntity.setCancelReason(params.get("cancel_reason").toString());
                 update(ConvertUtils.sourceToTarget(pensionOrderEntity, PensionOrderDTO.class));
             } else {
                 return false;

hmit-admin/src/main/resources/mapper/serviceOrder/NewsDao.xml

@@ -13,6 +13,7 @@
         <result property="createDate" column="create_date"/>
         <result property="updater" column="updater"/>
         <result property="updateDate" column="update_date"/>
+        <result property="status" column="status"/>
     </resultMap>