From 1bac1777cea6f88f557e65ce387892f9a05f06fb Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 25 Sep 2025 17:55:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SystemConfigController.java | 5 ++-- .../bonus/web/mapper/TransferApplyMapper.java | 2 ++ .../impl/TransferApplyServiceImpl.java | 24 ++++++++++++------- .../resources/mapper/TransferApplyMapper.xml | 5 ++++ .../system/domain/vo/SystemConfigVo.java | 15 ++++++++++++ .../system/mapper/ISystemConfigMapper.java | 2 ++ .../system/service/ISystemConfigService.java | 2 ++ .../service/impl/SystemConfigServiceImpl.java | 6 +++++ .../mapper/system/SystemConfigMapper.xml | 6 +++++ 9 files changed, 57 insertions(+), 10 deletions(-) create mode 100644 bonus-system/src/main/java/com/bonus/system/domain/vo/SystemConfigVo.java 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 e8eee1d..99b4e09 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 @@ -6,6 +6,7 @@ import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.page.TableDataInfo; import com.bonus.system.domain.SysConfig; import com.bonus.system.domain.SystemConfig; +import com.bonus.system.domain.vo.SystemConfigVo; import com.bonus.system.service.ISystemConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,8 +38,8 @@ public class SystemConfigController extends BaseController { * 获取参数配置单个列表 */ @GetMapping("/getConfig") - public AjaxResult getConfig(SystemConfig config) { - List list = configService.list(config); + public AjaxResult getConfig() { + List list = configService.listConfig(); return AjaxResult.success(list); } @RequiresPermissions("sys:config:add") diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java index 7f94d9a..e35130f 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java @@ -54,4 +54,6 @@ public interface TransferApplyMapper { Integer transferReceive(TransferFileDto dto); Integer isAllReceive(TransferFileDto dto); + + Integer updateTransferStatus(TransferFileDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java index 61c1e20..cd14000 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java @@ -39,7 +39,7 @@ public class TransferApplyServiceImpl implements TransferApplyService { dto.setCreateUserName(getLoginUser().getUsername()); dto.setUpdateUserId(getLoginUser().getUserId().intValue()); dto.setUpdateUserName(getLoginUser().getUsername()); - String proName = transferApplyMapper.getProNameById(dto); + String proName = transferApplyMapper.getProNameById(dto); dto.setProName(proName); Integer i = transferApplyMapper.insert(dto); List transferFileDtos = dto.getTransferFileDtos(); @@ -147,12 +147,20 @@ public class TransferApplyServiceImpl implements TransferApplyService { @Override public AjaxResult transferReceive(TransferFileDto dto) { -// transferApplyMapper.transferReceive(dto); -// // 查询该申请下，是否所有文件都已接收 -// Integer num = transferApplyMapper.isAllReceive(dto); -// if (num == 1){ -// return AjaxResult.success("接收成功"); -// } - return null; + try { + transferApplyMapper.transferReceive(dto); + // 查询该申请下，是否所有文件都已接收 + Integer num = transferApplyMapper.isAllReceive(dto); + if (num == 1) { + transferApplyMapper.updateTransferStatus(dto); + } + if (num > 0) { + return AjaxResult.success("接收成功"); + } else { + return AjaxResult.error("接收失败"); + } + } catch (Exception e) { + return AjaxResult.error("接口异常"); + } } } diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index bb6f5be..91b461c 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -285,6 +285,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" receive_time = now() WHERE id = #{id} + + UPDATE da_ky_transfer_apply + SET transfer_status = '1' + WHERE id = #{transferApplyId} + DELETE FROM da_ky_transfer_file WHERE transfer_apply_id = #{id} diff --git a/bonus-system/src/main/java/com/bonus/system/domain/vo/SystemConfigVo.java b/bonus-system/src/main/java/com/bonus/system/domain/vo/SystemConfigVo.java new file mode 100644 index 0000000..b12ebc6 --- /dev/null +++ b/bonus-system/src/main/java/com/bonus/system/domain/vo/SystemConfigVo.java @@ -0,0 +1,15 @@ +package com.bonus.system.domain.vo; + +import com.bonus.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 参数配置表 sys_config + * + * @author bonus + */ +@Data +public class SystemConfigVo { + private String configCode; + private String useStatus; +} 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 98beaf2..0658d52 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 @@ -2,6 +2,7 @@ package com.bonus.system.mapper; import com.bonus.common.core.domain.AjaxResult; import com.bonus.system.domain.SystemConfig; +import com.bonus.system.domain.vo.SystemConfigVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -20,4 +21,5 @@ public interface ISystemConfigMapper { Integer del(SystemConfig config); + List listConfig(); } 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 b34c06b..e006e86 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 @@ -3,6 +3,7 @@ package com.bonus.system.service; import com.bonus.common.core.domain.AjaxResult; import com.bonus.system.domain.SysConfig; import com.bonus.system.domain.SystemConfig; +import com.bonus.system.domain.vo.SystemConfigVo; import java.util.List; @@ -13,6 +14,7 @@ import java.util.List; */ public interface ISystemConfigService { + List listConfig(); List list(SystemConfig config); AjaxResult add(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 143c97a..6ba76be 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 @@ -3,6 +3,7 @@ package com.bonus.system.service.impl; import com.bonus.common.core.domain.AjaxResult; import com.bonus.system.domain.SysConfig; import com.bonus.system.domain.SystemConfig; +import com.bonus.system.domain.vo.SystemConfigVo; import com.bonus.system.mapper.ISystemConfigMapper; import com.bonus.system.service.ISystemConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +20,11 @@ public class SystemConfigServiceImpl implements ISystemConfigService { @Autowired private ISystemConfigMapper systemConfigMapper; + @Override + public List listConfig() { + return systemConfigMapper.listConfig(); + } + @Override public List list(SystemConfig config) { return systemConfigMapper.list(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..f3aec18 100644 --- a/bonus-system/src/main/resources/mapper/system/SystemConfigMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/SystemConfigMapper.xml @@ -34,4 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" use_status as useStatus from da_ky_system_config +