Compare commits

..

No commits in common. "924271bf2bfcadae5758eafcc400023a7f8e11d0" and "a1af8ab99c5d1633a4a2318cedd64112d33b28d3" have entirely different histories.

4 changed files with 7 additions and 6 deletions

View File

@ -89,6 +89,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{
int j = mapper.insertEinPro(record);
//3.bm_worker_ein_pro_record
int k = mapper.insertEinProRecord(record);
//4.pm_user 添加人员登录表 TODO
}
private void addWorkerWageCardDataAndContract(PmWorker record, List<WebFileDto> fileMsg) {

View File

@ -198,7 +198,7 @@ public class FileUtilController {
return R.fail("资源表id不能为空");
}
}
Integer num= service.delFileListById( id,sourceId,sourceTable,sourceType);
Integer num= service.delFileListById( id,sourceId,sourceType,sourceTable);
return R.ok(num);
}
catch (Exception e) {

View File

@ -34,7 +34,7 @@ public interface FileUtilMapper {
* @param sourceTable
* @return
*/
List<UploadFileVo> getFileList(@Param("id") String id,@Param("sourceId") String sourceId , @Param("sourceTable")String sourceTable, @Param("sourceType")String sourceType);
List<UploadFileVo> getFileList(@Param("id") String id,@Param("sourceId") String sourceId, @Param("sourceType")String sourceType, @Param("sourceTable")String sourceTable);
/**
* 删除文件集合
@ -51,7 +51,7 @@ public interface FileUtilMapper {
* @param sourceTable
* @return
*/
int delFileListBySourceId(@Param("id")String id,@Param("sourceId")String sourceId, @Param("sourceTable")String sourceTable, @Param("sourceType")String sourceType);
int delFileListBySourceId(@Param("id")String id,@Param("sourceId")String sourceId, @Param("sourceType")String sourceType, @Param("sourceTable")String sourceTable);
/**
* 查询数据集合

View File

@ -252,7 +252,7 @@ public class FileUtilsServiceImpl {
* @return
*/
public List<UploadFileVo> getFileList(String id, String sourceId, String sourceTable, String sourceType) throws Exception {
List<UploadFileVo> list=mapper.getFileList(id,sourceId,sourceTable,sourceType);
List<UploadFileVo> list=mapper.getFileList(id,sourceId,sourceType,sourceTable);
for (UploadFileVo vo:list){
String url=minioUtils.getFileUrl(vo.getBucketName(),vo.getFilePath(),60*60*12);
vo.setLsUrl(url);
@ -308,8 +308,8 @@ public class FileUtilsServiceImpl {
* @param sourceType
* @return
*/
public Integer delFileListById(String id, String sourceId,String sourceTable,String sourceType) {
List<UploadFileVo> list=mapper.getFileList(id,sourceId,sourceTable,sourceType);
public Integer delFileListById(String id, String sourceId, String sourceTable, String sourceType) {
List<UploadFileVo> list=mapper.getFileList(id,sourceId,sourceType,sourceTable);
int num=mapper.delFileListBySourceId(id,sourceId,sourceTable,sourceType);
if(num>0){
remoteFile(list);