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 1fa0d0b..316372d 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 @@ -170,7 +170,10 @@ public class TransferApplyServiceImpl implements TransferApplyService { transferApplyMapper.updateReceiveStatus(dto); } // 如果该项目下所有文件都已接收,则修改项目移交状态 - transferApplyMapper.isAllReceiveByProject(dto); + Integer allReceiveByProject = transferApplyMapper.isAllReceiveByProject(dto); + if (allReceiveByProject == 1) { + transferApplyMapper.updateTransferStatus(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 a9baed3..3ea6bea 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -666,7 +666,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" da_ky_sys_file_source dksfs LEFT JOIN da_ky_pro_files_contents dkpfc ON dksfs.business_id = dkpfc.id WHERE - dkpfc.pro_id = 1 + dkpfc.pro_id = #{proId} AND dkpfc.integrity_status = '1' AND dkpfc.LEVEL = 5 ) > 0 @@ -685,7 +685,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" da_ky_sys_file_source dksfs LEFT JOIN da_ky_pro_files_contents dkpfc ON dksfs.business_id = dkpfc.id WHERE - dkpfc.pro_id = 1 + dkpfc.pro_id = #{proId} AND dkpfc.integrity_status = '1' AND dkpfc.LEVEL = 5 ) src @@ -704,7 +704,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" da_ky_sys_file_source dksfs LEFT JOIN da_ky_pro_files_contents dkpfc ON dksfs.business_id = dkpfc.id WHERE - dkpfc.pro_id = 1 + dkpfc.pro_id = #{proId} AND dkpfc.integrity_status = '1' AND dkpfc.LEVEL = 5 ) 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 ba54756..609d1fc 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 @@ -71,6 +71,22 @@ public class KyFilesMultiClassify { this.fileRelated = fileRelated; } + public String getDictLabel() { + return dictLabel; + } + + public void setDictLabel(String dictLabel) { + this.dictLabel = dictLabel; + } + + public String getFileRelatedId() { + return fileRelatedId; + } + + public void setFileRelatedId(String fileRelatedId) { + this.fileRelatedId = fileRelatedId; + } + /** * 档案相关管理 */