Compare commits
No commits in common. "dc25255c8e2c1561c672d85054d4efd22c980302" and "5834c1340e0cf4094e7a7ff045413b5b35287fb8" have entirely different histories.
dc25255c8e
...
5834c1340e
|
|
@ -7,7 +7,6 @@ import com.bonus.common.core.domain.AjaxResult;
|
|||
import com.bonus.common.core.page.TableDataInfo;
|
||||
import com.bonus.common.enums.OperaType;
|
||||
import com.bonus.web.domain.TransferApplyDto;
|
||||
import com.bonus.web.domain.TransferFileDto;
|
||||
import com.bonus.web.service.TransferApplyService;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
@ -60,17 +59,5 @@ public class FileTransferRecordController extends BaseController {
|
|||
return AjaxResult.error("请求出错了");
|
||||
}
|
||||
}
|
||||
@ApiOperation(value = "档案移交申请详情")
|
||||
@GetMapping("getTransferRecordFiles")
|
||||
@SysLog(title = "档案移交申请详情", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "档案移交申请详情", logType = 1)
|
||||
public AjaxResult getTransferRecordFiles(TransferFileDto dto) {
|
||||
try {
|
||||
List<TransferFileDto> recordFiles = transferApplyService.getTransferRecordFiles(dto);
|
||||
return AjaxResult.success(recordFiles);
|
||||
} catch (Exception e) {
|
||||
log.error(e.toString(), e);
|
||||
return AjaxResult.error("请求出错了");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,4 @@ public interface TransferApplyMapper {
|
|||
List<String> getTransferApplyFilesContents(TransferApplyDto dto);
|
||||
|
||||
List<DaKyProFilesContentsDto> getTransferApplyFiles(String content);
|
||||
|
||||
List<TransferFileDto> getTransferRecordFiles(TransferFileDto dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import com.bonus.common.core.domain.entity.SysDept;
|
|||
import com.bonus.web.domain.DaKyProFilesContentsDto;
|
||||
import com.bonus.web.domain.SelectDto;
|
||||
import com.bonus.web.domain.TransferApplyDto;
|
||||
import com.bonus.web.domain.TransferFileDto;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -31,6 +30,4 @@ public interface TransferApplyService {
|
|||
List<SelectDto> getProSelect(TransferApplyDto dto);
|
||||
|
||||
List<DaKyProFilesContentsDto> getTransferApplyFiles(TransferApplyDto dto);
|
||||
|
||||
List<TransferFileDto> getTransferRecordFiles(TransferFileDto dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -124,9 +124,4 @@ public class TransferApplyServiceImpl implements TransferApplyService {
|
|||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TransferFileDto> getTransferRecordFiles(TransferFileDto dto) {
|
||||
return transferApplyMapper.getTransferRecordFiles(dto);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -428,7 +428,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dkpfc.integrity_status AS integrityStatus,
|
||||
dkfs.id AS fileId,
|
||||
dkfs.file_name AS fileName,
|
||||
dkfs.file_path AS filePath,
|
||||
dkfs.create_time AS createTime,
|
||||
dkfs.source_file_name AS sourceFileName,
|
||||
dkfs.create_user_name AS createUserName
|
||||
|
|
@ -446,8 +445,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
AND dkpfc.LEVEL = 5
|
||||
AND NOT EXISTS ( SELECT 1 FROM da_ky_transfer_file tf WHERE tf.file_source_id = dkfs.id )
|
||||
</select>
|
||||
<select id="getTransferRecordFiles" resultType="com.bonus.web.domain.TransferFileDto">
|
||||
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue