diff --git a/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml b/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml
index d341c33..36406c7 100644
--- a/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml
+++ b/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml
@@ -81,13 +81,15 @@
) AS applicant_num,
c.is_open,
create_source,
- ( CASE create_source WHEN 0 THEN '平台创建' WHEN 1 THEN '组织创建' ELSE '无' END ) AS createSource
+ ( CASE create_source WHEN 0 THEN '平台创建' WHEN 1 THEN '组织创建' ELSE '无' END ) AS createSource,
+ cla.classification_name,
+ c.classification_id
FROM
c_competition c
+ INNER JOIN c_competition_classification cla ON c.classification_id = cla.id
WHERE
1 = 1
-
and create_time between #{req.startTime} and #{req.endTime}
diff --git a/nakadai/src/main/java/com/huoran/nakadai/controller/SupplierClassificationController.java b/nakadai/src/main/java/com/huoran/nakadai/controller/SupplierClassificationController.java
index b1d622a..2c87523 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/controller/SupplierClassificationController.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/controller/SupplierClassificationController.java
@@ -36,7 +36,7 @@ public class SupplierClassificationController {
@PostMapping("/treeStructureList")
@ApiOperation(value = "树结构列表", response = SupplierClassification.class)
- public R treeStructureList(@RequestBody SupplierClassificationReq supplierClassification) {
+ public R treeStructureList() {
/*QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("parent_id", supplierClassification.getParentId());*/
List list = service.list(null);
diff --git a/nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassification.java b/nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassification.java
index 62d72e2..bed6a28 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassification.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassification.java
@@ -1,5 +1,6 @@
package com.huoran.nakadai.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -54,12 +55,16 @@ public class SupplierClassification implements Serializable {
//使用@JsonIgnore注解,忽略此属性,前端不会拿到该属性
@JsonIgnore
@ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
//使用@JsonIgnore注解,忽略此属性,前端不会拿到该属性
@JsonIgnore
@ApiModelProperty(value = "修改时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
+
+
@ApiModelProperty(value = "子分类集合")
@TableField(exist = false)
diff --git a/nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassificationConfig.java b/nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassificationConfig.java
index dc80357..ee55ff2 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassificationConfig.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/entity/SupplierClassificationConfig.java
@@ -26,6 +26,7 @@ public class SupplierClassificationConfig implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "分类id")