1.修改bug 2.修改小程序修改相关代码

fengjin

2022-10-13 ac31436a8da76a5388ff1700a34ea9247b8ec3d4

 flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java

@@ -3,9 +3,11 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IClassifyAdministrationService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,12 +30,17 @@

    @Autowired(required = true)
    IClassifyAdministrationService iClassifyAdministrationService;

    @Autowired(required = true)
    ITransactionEventService iTransactionEventService;

    /**
     * 获取管理菜单列表
     * @return
     */
    @ApiOperation(value = "获取管理菜单列表(无分页)",response = ClassifyAdministration.class)
    @GetMapping("/getList")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "classifyGrade",required = false) String classifyGrade)
    {
        int num=iClassifyAdministrationService.countNum("",classifyGrade);
@@ -58,12 +65,14 @@
    }



    /**
     * 获取管理菜单列表
     * @return
     */
    @ApiOperation(value = "获取管理菜单列表",response = ClassifyAdministration.class)
    @GetMapping("/getListPage")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "name",required = false) String name)
@@ -84,6 +93,7 @@
     */
    @ApiOperation(value = "新增分类",response = ClassifyAdministration.class)
    @PostMapping("/add")
    @Authorization
    public ResultData insertConfig(@RequestBody ClassifyAdministration entity) {
        Assert.notNull(entity, "参数不能为空");
        Assert.notNull(entity.getClassifyName(), "分类名称不能为空");
@@ -102,6 +112,7 @@
     */
    @ApiOperation("编辑分类")
    @PostMapping("/update")
    @Authorization
    public ResultData updateConfig(@RequestBody ClassifyAdministration entity)
    {
        return toAjax(iClassifyAdministrationService.updateConfig(entity));
@@ -114,12 +125,53 @@
     */
    @ApiOperation("删除分类")
    @DeleteMapping("/delete/{Id}")
    @Authorization
    public ResultData deleteConfigById(@PathVariable("Id") String Id)
    {
        if(StringUtils.isEmpty(Id))
        {
            return ResultData.error("id 不能为空");
        }

        /**
         * 根据上级id查询子分类
         * @param parentId
         * @return
         */
        List<String> list=iClassifyAdministrationService.selectParent(Id);
        if(list!=null && list.size()>0)
        {
            return ResultData.error("请先删除其下的二级分类");
        }

        List<String> listIds=iTransactionEventService.selectclassifyId(Id);
        if(listIds!=null && listIds.size()>0)
        {
            return ResultData.error("分类下有办事指南！不能删除");
        }

        return toAjax(iClassifyAdministrationService.deleteConfigById(Id));
    }

    /**
     * 获取分类根据id 如果是二级id则获取的是办事指南
     * @return
     */
    @ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
    @GetMapping("/queryListById")
    ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
        if(id==null)
            id=0;
        return  iClassifyAdministrationService.queryListById(id);
    }










}