台账发布

src/main/java/com/xjrsoft/module/ledger/controller/LedgerConfigReleaseController.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.ledger.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
@@ -9,7 +8,6 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.ledger.dto.AddLedgerConfigReleaseDto;
 import com.xjrsoft.module.ledger.dto.LedgerConfigReleasePageDto;
 import com.xjrsoft.module.ledger.dto.UpdateLedgerConfigReleaseDto;
-import com.xjrsoft.module.ledger.entity.LedgerConfigRelease;
 import com.xjrsoft.module.ledger.service.ILedgerConfigReleaseService;
 import com.xjrsoft.module.ledger.vo.LedgerConfigPageVo;
 import com.xjrsoft.module.ledger.vo.LedgerConfigReleasePageVo;
@@ -57,11 +55,11 @@ public class LedgerConfigReleaseController {
     @ApiOperation(value="根据id查询台账发布表信息")
     @SaCheckPermission("ledgerconfigrelease:detail")
     public RT<LedgerConfigReleaseVo> info(@RequestParam Long id){
-        LedgerConfigRelease ledgerConfigRelease = ledgerConfigReleaseService.getById(id);
-        if (ledgerConfigRelease == null) {
+        LedgerConfigReleaseVo release = ledgerConfigReleaseService.getRelease(id);
+        if (release == null) {
            return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(ledgerConfigRelease, LedgerConfigReleaseVo.class));
+        return RT.ok(release);
     }
 
 

src/main/java/com/xjrsoft/module/ledger/service/impl/LedgerConfigReleaseServiceImpl.java

@@ -110,9 +110,10 @@ public class LedgerConfigReleaseServiceImpl extends MPJBaseServiceImpl<LedgerCon
     @Override
     public Boolean deleteRelease(List<Long> ids) {
         for (Long id : ids) {
-            ledgerConfigReleaseMapper.deleteById(id);
             LedgerConfigRelease release = ledgerConfigReleaseMapper.selectById(id);
-            menuService.removeById(release.getId());
+            ledgerConfigReleaseMapper.deleteById(id);
+
+            menuService.removeById(release.getMenuId());
         }
         return true;
     }
@@ -123,7 +124,7 @@ public class LedgerConfigReleaseServiceImpl extends MPJBaseServiceImpl<LedgerCon
         if (release == null) {
             throw new MyException("未能找到发布信息");
         }
-        Menu menu = menuService.getById(release.getId());
+        Menu menu = menuService.getById(release.getMenuId());
         LedgerConfigReleaseVo vo = new LedgerConfigReleaseVo();
         vo.setId(id);
         vo.setLedgerConfigId(release.getLedgerConfigId());
@@ -132,7 +133,7 @@ public class LedgerConfigReleaseServiceImpl extends MPJBaseServiceImpl<LedgerCon
         MenuConfig menuConfig = new MenuConfig();
         menuConfig.setIcon(menu.getIcon());
         menuConfig.setCode(menu.getCode());
-        menuConfig.setName(menu.getName());
+        menuConfig.setName(menu.getTitle());
         menuConfig.setRemark(menu.getRemark());
         menuConfig.setSortCode(menu.getSortCode());
         vo.setMenuConfig(menuConfig);

src/main/resources/mapper/ledger/LedgerConfigReleaseMapper.xml

@@ -3,8 +3,8 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.ledger.mapper.LedgerConfigReleaseMapper">
-    <select id="getPage" parameterType="com.xjrsoft.module.ledger.dto.LedgerConfigPageDto" resultType="com.xjrsoft.module.ledger.vo.LedgerConfigPageVo">
-        SELECT t1.id, t3.name AS ledger_name,t2.name AS menu_name,t1.remark FROM ledger_config_release t1
+    <select id="getPage" parameterType="com.xjrsoft.module.ledger.dto.LedgerConfigReleasePageDto" resultType="com.xjrsoft.module.ledger.vo.LedgerConfigReleasePageVo">
+        SELECT t1.id, t3.name AS ledger_name,t2.title AS menu_name,t1.remark FROM ledger_config_release t1
         LEFT JOIN xjr_menu t2 ON t1.menu_id = t2.id
         LEFT JOIN ledger_config t3 ON t1.ledger_config_id = t3.id
         WHERE t1.delete_mark = 0