8ee88e8c511b75f2b2e566c37b38209a0c35afa8..47f9dffa729e76ae5d0f2f845f55d8cc7179e8ac
2023-09-11 jiaosong
Merge remote-tracking branch 'origin/dev' into dev
47f9df 对比 | 目录
2023-09-11 jiaosong
#分类查询一对多设置
ecc325 对比 | 目录
已修改3个文件
37 ■■■■ 文件已修改
server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/resources/mappers/BaseCategoryMapper.xml 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
@@ -84,8 +84,20 @@
    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:basecategory:query")
//    @RequiresPermissions("business:basecategory:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(baseCategoryService.findById(id));
    }
    /**
     * 条件查询
     *
     * @param baseCategory 实体对象
     * @return List<BaseCategory>
     */
    @ApiOperation("根据ID查询")
    @PostMapping("/findList")
    public ApiResponse<List<BaseCategory>> findList(@RequestBody BaseCategory baseCategory){
        return ApiResponse.success(baseCategoryService.findList(baseCategory));
    }
}
server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java
@@ -7,10 +7,11 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.BaseGoods;
import com.doumee.dao.business.model.dto.BaseGoodsCreateOrUpdateRequest;
import com.doumee.service.business.BaseGoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -34,7 +35,7 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:basegoods:create")
    public ApiResponse create(@RequestBody BaseGoods baseGoods) {
    public ApiResponse create(@RequestBody BaseGoodsCreateOrUpdateRequest baseGoods) {
        return ApiResponse.success(baseGoodsService.create(baseGoods));
    }
server/service/src/main/resources/mappers/BaseCategoryMapper.xml
@@ -4,11 +4,25 @@
    <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}"
                    column="{categoryId=id}"
                    ofType="com.doumee.dao.business.model.BaseCateParam"
                    javaType="ArrayList"
                    select="com.doumee.dao.system.getStudent" />
                    select="com.doumee.dao.business.BaseCateParamMapper.getBaseCateParamList" />
    </resultMap>
    <select id="selectById" resultMap="BaseCategory">
        select * from base_category where id = #{id}
    </select>
    <select id="selectOne" resultMap="BaseCategory">
        select * from base_category ${ew.customSqlSegment}
    </select>
    <select id="selectList" resultMap="BaseCategory">
        select * from base_category ${ew.customSqlSegment}
    </select>
    <select id="selectPage" resultMap="BaseCategory">
        select * from base_category ${ew.customSqlSegment}
    </select>
</mapper>