默认选择 多选或者单选

.gitignore

 log
-*.log
\ No newline at end of file
+*.log
+target
\ No newline at end of file

src/main/java/com/gogirl/application/product/serve/ITechniqueSkuService.java

 package com.gogirl.application.product.serve;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.product.serve.TechniqueCategory;
 import com.gogirl.domain.product.serve.TechniqueSku;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +22,10 @@ public interface ITechniqueSkuService extends IService<TechniqueSku> {
      * @return
      */
     List<TechniqueSku> queryAll();
+
+    /**
+     * 查询所有款式技法分组 包括默认数量 单选多选
+     * @return
+     */
+    Map<TechniqueCategory, List<TechniqueSku>> queryTechniqueSkuMap();
 }

src/main/java/com/gogirl/application/product/serve/impl/TechniqueSkuServiceImpl.java

 package com.gogirl.application.product.serve.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gogirl.application.product.serve.ITechniqueSkuService;
+import com.gogirl.domain.product.serve.TechniqueCategory;
 import com.gogirl.domain.product.serve.TechniqueSku;
+import com.gogirl.infrastructure.mapper.product.serve.TechniqueCategoryMapper;
 import com.gogirl.infrastructure.mapper.product.serve.TechniqueSkuMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -22,10 +27,23 @@ public class TechniqueSkuServiceImpl extends ServiceImpl<TechniqueSkuMapper, Tec
 
     @Resource
     TechniqueSkuMapper techniqueSkuMapper;
+    @Resource
+    TechniqueCategoryMapper techniqueCategoryMapper;
 
     @Override
     public List<TechniqueSku> queryAll() {
 
         return techniqueSkuMapper.queryAll();
     }
+
+    @Override
+    public Map<TechniqueCategory, List<TechniqueSku>> queryTechniqueSkuMap() {
+
+        List<TechniqueSku> techniqueSkuList = this.list();
+        List<TechniqueCategory> techniqueCategoryList = techniqueCategoryMapper.selectList(new LambdaQueryWrapper<>());
+        Map<Integer, TechniqueCategory> techniqueCategoryMap = techniqueCategoryList.stream().collect(Collectors.toMap(TechniqueCategory::getId, a -> a, (k1, k2) -> k1));
+        techniqueSkuList.forEach(techniqueSku -> techniqueSku.setTechniqueCategory(techniqueCategoryMap.get(techniqueSku.getTechniqueCategoryId())));
+
+        return techniqueSkuList.stream().collect(Collectors.groupingBy(TechniqueSku::getTechniqueCategory));
+    }
 }

src/main/java/com/gogirl/domain/product/serve/TechniqueCategory.java

@@ -21,7 +21,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="TechniqueCategory对象", description="技法类目")
+@ApiModel(value = "TechniqueCategory对象", description = "技法类目")
 public class TechniqueCategory implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -34,5 +34,7 @@ public class TechniqueCategory implements Serializable {
     @ApiModelProperty(value = "base_type 的 id")
     private Integer serviceTypeId;
 
+    private Integer multiSelect;
+
 
 }

src/main/java/com/gogirl/domain/product/serve/TechniqueSku.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,7 +26,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="TechniqueSku对象", description="技法sku")
+@ApiModel(value = "TechniqueSku对象", description = "技法sku")
 public class TechniqueSku implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -78,4 +79,13 @@ public class TechniqueSku implements Serializable {
     @TableField(exist = false)
     private Integer quantity;
 
+    @ApiModelProperty(value = "默认选中数量")
+    private Integer defaultSelectQuantity;
+
+    @ApiModelProperty(value = "是否默认选中 1-是 2-否")
+    private Integer defaultSelect;
+
+    @JsonIgnore
+    @TableField(exist = false)
+    private TechniqueCategory techniqueCategory;
 }

src/main/java/com/gogirl/interfaces/product/serve/TechniqueSkuController.java

@@ -2,6 +2,7 @@ package com.gogirl.interfaces.product.serve;
 
 
 import com.gogirl.application.product.serve.ITechniqueSkuService;
+import com.gogirl.domain.product.serve.TechniqueCategory;
 import com.gogirl.domain.product.serve.TechniqueSku;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import io.swagger.annotations.Api;
@@ -36,10 +37,19 @@ public class TechniqueSkuController {
     }
 
 
+    @Deprecated
     @ApiOperation("查询所有款式技法分组")
     @GetMapping("/technician/techniqueSku/queryMap")
     public JsonResult<Map<String, List<TechniqueSku>>> queryMap() {
         List<TechniqueSku> techniqueSkuList = techniqueSkuService.queryAll();
         return JsonResult.success(techniqueSkuList.stream().collect(Collectors.groupingBy(TechniqueSku::getTechniqueCategoryName)));
     }
+
+
+    @ApiOperation("查询所有款式技法分组")
+    @GetMapping("/technician/techniqueSku/queryTechniqueSkuMap")
+    public JsonResult<Map<TechniqueCategory, List<TechniqueSku>>> queryTechniqueSkuMap() {
+        Map<TechniqueCategory, List<TechniqueSku>> map = techniqueSkuService.queryTechniqueSkuMap();
+        return JsonResult.success(map);
+    }
 }