bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
haozq 2025-08-16 16:23:35 +08:00
parent 7c2d6571c1 924271bf2b
commit 015210d5a3
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
View File

@ -89,7 +89,6 @@ 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) {

2
bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/FileUtilController.java
View File

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

4
bonus-modules/bonus-file/src/main/java/com/bonus/file/mapper/FileUtilMapper.java
View File

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

6
bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
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,sourceType,sourceTable);
List<UploadFileVo> list=mapper.getFileList(id,sourceId,sourceTable,sourceType);
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,sourceType,sourceTable);
public Integer delFileListById(String id, String sourceId,String sourceTable,String sourceType) {
List<UploadFileVo> list=mapper.getFileList(id,sourceId,sourceTable,sourceType);
int num=mapper.delFileListBySourceId(id,sourceId,sourceTable,sourceType);
if(num>0){
remoteFile(list);