修改服务大类展示接口service表数据

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

@@ -66,6 +66,39 @@ public class PensionServiceController {
     }
 
 
+    @GetMapping("getByServiceId/{serviceId}")
+    @ApiOperation("根据服务获取详情页面")
+    public Result<PensionServiceDTO> getByServiceId(@PathVariable("serviceId") Long serviceId){
+        PensionServiceDTO data =  pensionServiceService.get(serviceId);
+
+        return new Result<PensionServiceDTO>().ok(data);
+    }
+
+    @GetMapping("getSecondListByServiceId")
+    @ApiOperation("根据服务id获取二级列表--可查询免费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "isFree", value = "是否免费：1 是， 2 否", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "pid", value = "服务大类ID", paramType = "query", dataType="int")
+    })
+    public Result<List<PensionServiceDTO>> getSecondListByServiceId(@ApiIgnore @RequestParam Map<String, Object> params){
+        List<PensionServiceDTO> data =  pensionServiceService.list(params);
+
+        return new Result<List<PensionServiceDTO>>().ok(data);
+    }
+
+    @GetMapping("getServiceList")
+    @ApiOperation("老人/子女服务大类--包含免费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "isFree", value = "是否免费：1 是， 2 否", paramType = "query", dataType="String")
+    })
+    public Result<List<PensionServiceDTO>> getServiceList(@ApiIgnore @RequestParam Map<String, Object> params){
+        List<PensionServiceDTO> data =  pensionServiceService.getFirstServiceList(params);
+
+        return new Result<List<PensionServiceDTO>>().ok(data);
+    }
+
+/*
+//V1 根据serviceType 获取服务大类
     @GetMapping("getByServiceTypeId/{serviceTypeId}")
     @ApiOperation("根据服务大类获取详情")
     public Result<PensionServiceDTO> getByServiceTypeId(@PathVariable("serviceTypeId") Long serviceTypeId){
@@ -76,6 +109,7 @@ public class PensionServiceController {
         return new Result<PensionServiceDTO>().ok(data.get(0));
     }
 
+*/
     @PostMapping
     @ApiOperation("保存")
     public Result save(@RequestBody PensionServiceDTO dto){

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

@@ -25,8 +25,8 @@ public class PensionServiceDTO implements Serializable {
 	@ApiModelProperty(value = "服务名称")
 	private String serviceName;
 
-	@ApiModelProperty(value = "服务类型")
-	private Long serviceTypeId;
+	@ApiModelProperty(value = "服务父类id")
+	private Long pid;
 
 	@ApiModelProperty(value = "排序")
 	private Integer sort;
@@ -52,20 +52,4 @@ public class PensionServiceDTO implements Serializable {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 
-	@ApiModelProperty(value = "部门ID")
-	private Long deptId;
-
-	@ApiModelProperty(value = "创建者")
-	private Long creator;
-
-	@ApiModelProperty(value = "创建时间")
-	private Date createDate;
-
-	@ApiModelProperty(value = "更新者")
-	private Long updater;
-
-	@ApiModelProperty(value = "更新时间")
-	private Date updateDate;
-
-
 }

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

@@ -27,9 +27,9 @@ public class PensionServiceEntity extends BaseEntity {
 //    @Property(value = "name")
 	private String serviceName;
     /**
-     * 服务类型
+     * 服务父类id
      */
-	private Long serviceTypeId;
+	private Long pid;
     /**
      * 排序
      */

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

@@ -4,6 +4,9 @@ import io.hmit.common.service.CrudService;
 import io.hmit.modules.serviceOrder.dto.PensionServiceDTO;
 import io.hmit.modules.serviceOrder.entity.PensionServiceEntity;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 服务表
  *
@@ -12,4 +15,5 @@ import io.hmit.modules.serviceOrder.entity.PensionServiceEntity;
  */
 public interface PensionServiceService extends CrudService<PensionServiceEntity, PensionServiceDTO> {
 
-}
\ No newline at end of file
+    List<PensionServiceDTO> getFirstServiceList(Map<String, Object> params);
+}

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

@@ -2,6 +2,7 @@ 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.common.utils.ConvertUtils;
 import io.hmit.modules.serviceOrder.dao.PensionServiceDao;
 import io.hmit.modules.serviceOrder.dto.PensionServiceDTO;
 import io.hmit.modules.serviceOrder.entity.PensionServiceEntity;
@@ -9,6 +10,8 @@ import io.hmit.modules.serviceOrder.service.PensionServiceService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -24,17 +27,38 @@ public class PensionServiceServiceImpl extends CrudServiceImpl<PensionServiceDao
     @Override
     public QueryWrapper<PensionServiceEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get("id");
-        String serviceTypeId = params.get("serviceTypeId") ==null?"":params.get("serviceTypeId").toString();
+        String pid = params.get("pid") ==null?"":params.get("pid").toString();
         String isFree = (String)params.get("isFree");
 
 
         QueryWrapper<PensionServiceEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-        wrapper.eq(StringUtils.isNotBlank(serviceTypeId), "service_type_id", serviceTypeId);
+        wrapper.eq(StringUtils.isNotBlank(pid), "pid", pid);
         wrapper.eq(StringUtils.isNotBlank(isFree), "is_free", isFree);
 
         return wrapper;
     }
 
 
+    @Override
+    public List<PensionServiceDTO> getFirstServiceList(Map<String, Object> params) {
+        String isFree = (String)params.get("isFree");
+        List<PensionServiceEntity> pensionServiceLists = baseDao.selectList(
+                new QueryWrapper<PensionServiceEntity>().eq("pid",0));
+
+        if(!"".equals(isFree) && isFree != null){
+            List<PensionServiceEntity> entityList = new ArrayList<>();
+            pensionServiceLists.stream().forEach(item->{
+                Map<String, Object> pid = new HashMap<>();
+                pid.put("pid",item.getId());
+                pid.put("isFree",isFree);
+                if(list(pid).size()>0){
+                    entityList.add(item);
+                }
+            });
+            return ConvertUtils.sourceToTarget(entityList,PensionServiceDTO.class) ;
+        }
+
+        return ConvertUtils.sourceToTarget(pensionServiceLists,PensionServiceDTO.class) ;
+    }
 }

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

@@ -89,10 +89,12 @@ public class PensionServiceTypeServiceImpl extends CrudServiceImpl<PensionServic
 //        pensionServices.stream().collect(Collectors.groupingBy(PensionServiceEntity::getServiceTypeId))
         List<PensionServiceTypeDTO> resultList = new ArrayList<>();
 
+/*
         for (PensionServiceEntity pensionService:pensionServices) {
             PensionServiceTypeDTO pensionServiceTypeDTO = get(pensionService.getServiceTypeId());
             resultList.add(pensionServiceTypeDTO);
         }
+*/
         return resultList;
     }
 }