From 8ee88e8c511b75f2b2e566c37b38209a0c35afa8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 11 九月 2023 16:46:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/resources/mappers/BaseCateParamMapper.xml | 21 +++++++++++++++++++++
server/service/src/main/java/com/doumee/dao/business/BaseCateParamMapper.java | 11 +++++++++++
server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java | 8 ++++++--
server/service/src/main/resources/mappers/BaseCategoryMapper.xml | 14 ++++++++++++++
4 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/BaseCateParamMapper.java b/server/service/src/main/java/com/doumee/dao/business/BaseCateParamMapper.java
index 610b927..64cc487 100644
--- a/server/service/src/main/java/com/doumee/dao/business/BaseCateParamMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/BaseCateParamMapper.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.BaseCateParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @author 姹熻箘韫�
@@ -9,4 +12,12 @@
*/
public interface BaseCateParamMapper extends BaseMapper<BaseCateParam> {
+
+ /**
+ *
+ * 鏌ヨ鍙傛暟閰嶇疆
+ * @param categoryId
+ * @return
+ */
+ List<BaseCateParam> getBaseCateParamList(@Param("categoryId") Integer categoryId);
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
index 86a4e9d..93ee05f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
@@ -12,6 +12,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 绱犳潗搴�-鍝佺被淇℃伅琛�
@@ -89,8 +90,11 @@
@ExcelColumn(name="鍔犱环绯绘暟")
private BigDecimal priceRate;
- @ApiModelProperty(value = "鍥炬爣")
- @ExcelColumn(name="鍥炬爣")
+ @ApiModelProperty(value = "鍥炬爣 鍏ㄨ矾寰�")
@TableField(exist = false)
private String imgfullurl;
+
+ @ApiModelProperty(value = "鍝佺被鍙傛暟")
+ @TableField(exist = false)
+ private List<BaseCateParam> baseCateParamList;
}
diff --git a/server/service/src/main/resources/mappers/BaseCateParamMapper.xml b/server/service/src/main/resources/mappers/BaseCateParamMapper.xml
new file mode 100644
index 0000000..be96527
--- /dev/null
+++ b/server/service/src/main/resources/mappers/BaseCateParamMapper.xml
@@ -0,0 +1,21 @@
+<?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="com.doumee.dao.business.BaseCateParamMapper">
+
+ <resultMap id="BaseCateParam" type="com.doumee.dao.business.model.BaseCateParam">
+ <id column="ID" jdbcType="INTEGER" property="id" />
+ <result column="CREATOR" jdbcType="INTEGER" property="creator" />
+ <result column="CREATE_DATE" jdbcType="VARCHAR" property="createDate" />
+ <result column="EDITOR" jdbcType="VARCHAR" property="editor" />
+ <result column="EDIT_DATE" jdbcType="VARCHAR" property="editDate"/>
+ <result column="ISDELETED" jdbcType="TIMESTAMP" property="isdeleted"/>
+ <result column="NAME" jdbcType="TIMESTAMP" property="name"/>
+ <result column="REMARK" jdbcType="TIMESTAMP" property="remark"/>
+ <result column="STATUS" jdbcType="TIMESTAMP" property="status"/>
+ <result column="SORTNUM" jdbcType="TIMESTAMP" property="sortnum"/>
+ <result column="CATEGORY_ID" jdbcType="TIMESTAMP" property="categoryId"/>
+ </resultMap>
+ <select id="getBaseCateParamList" resultType="com.doumee.dao.business.model.BaseCateParam">
+ select * from base_cate_param where CATEGORY_ID = #{categoryId}
+ </select>
+</mapper>
diff --git a/server/service/src/main/resources/mappers/BaseCategoryMapper.xml b/server/service/src/main/resources/mappers/BaseCategoryMapper.xml
new file mode 100644
index 0000000..6b014d5
--- /dev/null
+++ b/server/service/src/main/resources/mappers/BaseCategoryMapper.xml
@@ -0,0 +1,14 @@
+<?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="com.doumee.dao.business.BaseCategoryMapper">
+ <resultMap id="BaseCategory" type="com.doumee.dao.business.model.BaseCategory" autoMapping="true">
+ <id column="ID" jdbcType="INTEGER" property="id"/>
+ <collection property="baseCateParamList"
+ column="{id=categoryId}"
+ ofType="com.doumee.dao.business.model.BaseCateParam"
+ javaType="ArrayList"
+ select="com.doumee.dao.system.getStudent" />
+ </resultMap>
+
+
+</mapper>
--
Gitblit v1.9.3