|
@@ -65,6 +65,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
|
|
import org.springframework.jdbc.core.SingleColumnRowMapper;
|
|
import org.springframework.jdbc.core.SingleColumnRowMapper;
|
|
import org.springframework.scheduling.annotation.Async;
|
|
import org.springframework.scheduling.annotation.Async;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
@@ -3738,14 +3739,15 @@ public R<List<Integer>> getReportNumberByContractId(@RequestParam String contrac
|
|
* @param contractId 合同段ID
|
|
* @param contractId 合同段ID
|
|
* @return 填报人集合
|
|
* @return 填报人集合
|
|
*/
|
|
*/
|
|
-@PostMapping("/getFileUserByContractId")
|
|
|
|
|
|
+@GetMapping("/getFileUserByContractId")
|
|
@ApiOperationSupport(order = 5)
|
|
@ApiOperationSupport(order = 5)
|
|
@ApiOperation(value = "根据合同段ID获取所有填报人")
|
|
@ApiOperation(value = "根据合同段ID获取所有填报人")
|
|
@ApiImplicitParam(name = "contractId", value = "合同段ID", required = true)
|
|
@ApiImplicitParam(name = "contractId", value = "合同段ID", required = true)
|
|
-public R<List<FileUserVO>> getFileUserByContractId(@RequestParam String contractId) {
|
|
|
|
|
|
+public R<List<FileUserVO>> getFileUserByContractId(@RequestParam String contractId,@RequestParam String contractIdRelation) {
|
|
//获取合同段信息
|
|
//获取合同段信息
|
|
ContractInfo contract = this.contractClient.getContractById(Long.valueOf(contractId));
|
|
ContractInfo contract = this.contractClient.getContractById(Long.valueOf(contractId));
|
|
- return R.data(this.informationQueryService.queryFileUserByContractId(contract.getContractType() == null ? 1 : contract.getContractType(), contractId));
|
|
|
|
|
|
+
|
|
|
|
+ return R.data(this.informationQueryService.queryFileUserByContractId(contract.getContractType() == null ? 1 : contract.getContractType(), contractIdRelation));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -4147,4 +4149,10 @@ public R<Object> customAddContractNode(@RequestBody CustomAddContractNodeDTO dto
|
|
}
|
|
}
|
|
return R.fail("未获取到当前选择节点信息");
|
|
return R.fail("未获取到当前选择节点信息");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @PostMapping("/importTree")
|
|
|
|
+ public R importTree(@RequestParam("file") MultipartFile file, Long pekyId){
|
|
|
|
+
|
|
|
|
+ return R.success("操作成功");
|
|
|
|
+ }
|
|
}
|
|
}
|