工作组变更
This commit is contained in:
+19
@@ -215,6 +215,25 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 复制
|
||||||
|
*
|
||||||
|
* @param payWorkingGroup 工作组项目
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@ApiOperation(value="工作组项目-复制", notes="工作组项目-复制")
|
||||||
|
@PostMapping(value = "/copy")
|
||||||
|
public Result<?> copy(@RequestBody PayWorkingGroup payWorkingGroup) {
|
||||||
|
if(StringUtils.isBlank(payWorkingGroup.getId())){
|
||||||
|
return Result.error("工作组id不能为空!");
|
||||||
|
}
|
||||||
|
payWorkingGroupService.copy(payWorkingGroup);
|
||||||
|
|
||||||
|
setPayWorkingGroup(payWorkingGroup);
|
||||||
|
payWorkingGroupService.save(payWorkingGroup);
|
||||||
|
return Result.OK("添加成功!");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加
|
* 添加
|
||||||
*
|
*
|
||||||
|
|||||||
+9
@@ -83,5 +83,14 @@ public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
|
|||||||
List<PayWorkingGroupStatistics> queryPageListForStatisticsExcel();
|
List<PayWorkingGroupStatistics> queryPageListForStatisticsExcel();
|
||||||
|
|
||||||
List<String> getGroupList();
|
List<String> getGroupList();
|
||||||
|
/**
|
||||||
|
* @Description 复制
|
||||||
|
* @Author lqt
|
||||||
|
* @Date 2021/9/17
|
||||||
|
* @Param
|
||||||
|
* @Return
|
||||||
|
* @Exception
|
||||||
|
*/
|
||||||
|
void copy(PayWorkingGroup payWorkingGroup);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-6
@@ -82,11 +82,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
|||||||
throw new JeroBootException("没有找到文件!");
|
throw new JeroBootException("没有找到文件!");
|
||||||
}
|
}
|
||||||
OSSFile byId = iossFileService.getById(payWorkingGroupDataFile.getFileId());
|
OSSFile byId = iossFileService.getById(payWorkingGroupDataFile.getFileId());
|
||||||
// 文件名称
|
|
||||||
String fileName = byId.getFileName();
|
|
||||||
String path = env.getProperty("jero.path.upload") + File.separator;
|
String path = env.getProperty("jero.path.upload") + File.separator;
|
||||||
List<String> listFile = new ArrayList<>();
|
List<String> listFile = new ArrayList<>();
|
||||||
listFile.add(path + fileName);
|
// 文件路径
|
||||||
|
String url = byId.getUrl();
|
||||||
|
listFile.add(path + url);
|
||||||
List<String> list = new ArrayList<>();
|
List<String> list = new ArrayList<>();
|
||||||
String msg = "";
|
String msg = "";
|
||||||
if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
|
if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
|
||||||
@@ -158,9 +158,9 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
|
|||||||
List<String> listFile = new ArrayList<>();
|
List<String> listFile = new ArrayList<>();
|
||||||
listPayWorkingGroupDataFile.forEach(p->{
|
listPayWorkingGroupDataFile.forEach(p->{
|
||||||
OSSFile byId = iossFileService.getById(p.getFileId());
|
OSSFile byId = iossFileService.getById(p.getFileId());
|
||||||
// 文件名称
|
// 文件路径
|
||||||
String fileName = byId.getFileName();
|
String url = byId.getUrl();
|
||||||
listFile.add(path + fileName);
|
listFile.add(path + url);
|
||||||
});
|
});
|
||||||
String msg = "";
|
String msg = "";
|
||||||
List<String> list = new ArrayList<>();
|
List<String> list = new ArrayList<>();
|
||||||
|
|||||||
+5
@@ -99,6 +99,11 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
|
|||||||
return payWorkingGroupMapper.getGroupList();
|
return payWorkingGroupMapper.getGroupList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void copy(PayWorkingGroup payWorkingGroup) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description 校验是存在关联合同的项目
|
* @Description 校验是存在关联合同的项目
|
||||||
* @Author lqt
|
* @Author lqt
|
||||||
|
|||||||
Reference in New Issue
Block a user