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 b01db81..0101caa 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 @@ -65,4 +65,6 @@ public interface TransferApplyMapper { Integer getAllTransferStatus(TransferFileDto dto); Integer updateReceiveStatus(TransferFileDto dto); + + Integer isAllReceiveByProject(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 e18b04e..1fa0d0b 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 @@ -169,6 +169,8 @@ public class TransferApplyServiceImpl implements TransferApplyService { if (num == 1) { transferApplyMapper.updateReceiveStatus(dto); } + // 如果该项目下所有文件都已接收,则修改项目移交状态 + transferApplyMapper.isAllReceiveByProject(dto); if (i > 0) { return AjaxResult.success("接收成功"); } else { diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index d51a98c..a9baed3 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -654,5 +654,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE transfer_apply_id = #{transferApplyId} + diff --git a/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java index 41b9874..ba54756 100644 --- a/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java +++ b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java @@ -75,6 +75,10 @@ public class KyFilesMultiClassify { * 档案相关管理 */ private String fileRelated; + /** + * 档案相关管理 + */ + private String fileRelatedId; /** * 修改人 diff --git a/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml b/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml index 90da8b3..20d68d0 100644 --- a/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"