|
@@ -349,8 +349,22 @@ public class ArchiveFileController extends BladeController {
|
|
|
@GetMapping("/getDutyUser")
|
|
|
@ApiOperationSupport(order = 15)
|
|
|
@ApiOperation(value = "文件收集-上传文件责任者")
|
|
|
- public R getDutyUser(Long contractId) {
|
|
|
- ContractInfo contractById = contractClient.getContractById(contractId);
|
|
|
+ public R getDutyUser(Long contractId,Long projectId) {
|
|
|
+ ContractInfo contractById = null;
|
|
|
+ if(contractId == -1) {
|
|
|
+ List<Long> longs = new ArrayList<>();
|
|
|
+ longs.add(projectId);
|
|
|
+ List<ContractInfo> contractInfos = contractClient.queryContractListByIds(longs);
|
|
|
+ for(ContractInfo info : contractInfos){
|
|
|
+ if(info.getContractType() == 3){
|
|
|
+ contractById = info;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ contractById = contractClient.getContractById(contractId);
|
|
|
+
|
|
|
+ }
|
|
|
return R.data(contractById);
|
|
|
}
|
|
|
|