diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/system/SystemConfigController.java b/bonus-admin/src/main/java/com/bonus/web/controller/system/SystemConfigController.java index bd0a8d0..d926ccd 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/system/SystemConfigController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/system/SystemConfigController.java @@ -33,6 +33,14 @@ public class SystemConfigController extends BaseController { List list = configService.list(config); return getDataTable(list); } + /** + * 获取参数配置单个列表 + */ + @GetMapping("/getConfigById") + public AjaxResult getConfigById(SystemConfig config) { + SystemConfig systemConfig = configService.getConfigById(config); + return AjaxResult.success(systemConfig); + } @RequiresPermissions("sys:config:add") @PostMapping("/add") public AjaxResult add(@RequestBody SystemConfig config) { diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 2dd63a8..a2567b1 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -364,7 +364,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT dkp.pro_name AS proName, dkp.single_pro_name AS singleProName, - dktf.file_name AS fileName + dktf.file_name AS fileName, + dktf.receive_status AS receiveStatus FROM da_ky_transfer_file dktf left join da_ky_project dkp on dkp.id = dktf.pro_id where dktf.transfer_apply_id = #{id} diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/ISystemConfigMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/ISystemConfigMapper.java index fff1044..b7938ba 100644 --- a/bonus-system/src/main/java/com/bonus/system/mapper/ISystemConfigMapper.java +++ b/bonus-system/src/main/java/com/bonus/system/mapper/ISystemConfigMapper.java @@ -19,4 +19,6 @@ public interface ISystemConfigMapper { Integer update(SystemConfig config); Integer del(SystemConfig config); + + SystemConfig getConfigById(SystemConfig config); } diff --git a/bonus-system/src/main/java/com/bonus/system/service/ISystemConfigService.java b/bonus-system/src/main/java/com/bonus/system/service/ISystemConfigService.java index a2afb8b..fabf632 100644 --- a/bonus-system/src/main/java/com/bonus/system/service/ISystemConfigService.java +++ b/bonus-system/src/main/java/com/bonus/system/service/ISystemConfigService.java @@ -20,4 +20,6 @@ public interface ISystemConfigService { AjaxResult update(SystemConfig config); AjaxResult del(SystemConfig config); + + SystemConfig getConfigById(SystemConfig config); } diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/SystemConfigServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/SystemConfigServiceImpl.java index d71e670..9dfad16 100644 --- a/bonus-system/src/main/java/com/bonus/system/service/impl/SystemConfigServiceImpl.java +++ b/bonus-system/src/main/java/com/bonus/system/service/impl/SystemConfigServiceImpl.java @@ -53,4 +53,9 @@ public class SystemConfigServiceImpl implements ISystemConfigService { return AjaxResult.error("删除失败"); } } + + @Override + public SystemConfig getConfigById(SystemConfig config) { + return systemConfigMapper.getConfigById(config); + } } diff --git a/bonus-system/src/main/resources/mapper/system/SystemConfigMapper.xml b/bonus-system/src/main/resources/mapper/system/SystemConfigMapper.xml index 341191c..c7153b9 100644 --- a/bonus-system/src/main/resources/mapper/system/SystemConfigMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/SystemConfigMapper.xml @@ -34,4 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" use_status as useStatus from da_ky_system_config +