import
parent
796de974a5
commit
2dd150bbe7
|
|
@ -69,4 +69,10 @@ public class OrgPersonnelController {
|
||||||
@ApiParam("导入文件") @RequestParam("file") MultipartFile file) {
|
@ApiParam("导入文件") @RequestParam("file") MultipartFile file) {
|
||||||
return orgPersonnelApi.importPersonnel(file);
|
return orgPersonnelApi.importPersonnel(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation("导入人员模版下载地址")
|
||||||
|
@GetMapping("/import/template")
|
||||||
|
public SingleResponse<String> importTemplate() {
|
||||||
|
return orgPersonnelApi.importTemplate();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,9 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
|
||||||
|
|
||||||
@Value("${safety-eval.gbs-user-sync.fail-fast:true}")
|
@Value("${safety-eval.gbs-user-sync.fail-fast:true}")
|
||||||
private boolean gbsUserSyncFailFast;
|
private boolean gbsUserSyncFailFast;
|
||||||
|
@Value("${template.personnel.import.url:}")
|
||||||
|
private String personImportTemplateUrl;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
|
|
@ -270,4 +273,9 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi {
|
||||||
public SingleResponse<OrgPersonnelImportResultCO> importPersonnel(MultipartFile file) {
|
public SingleResponse<OrgPersonnelImportResultCO> importPersonnel(MultipartFile file) {
|
||||||
return SingleResponse.success(orgPersonnelExcelImporter.importPersonnel(file));
|
return SingleResponse.success(orgPersonnelExcelImporter.importPersonnel(file));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SingleResponse<String> importTemplate() {
|
||||||
|
return SingleResponse.success(personImportTemplateUrl);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,4 +43,11 @@ public interface OrgPersonnelApi {
|
||||||
* @return 导入结果(成功条数与异常明细)
|
* @return 导入结果(成功条数与异常明细)
|
||||||
*/
|
*/
|
||||||
SingleResponse<OrgPersonnelImportResultCO> importPersonnel(MultipartFile file);
|
SingleResponse<OrgPersonnelImportResultCO> importPersonnel(MultipartFile file);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取导入人员模版下载地址。
|
||||||
|
*
|
||||||
|
* @return 模版下载地址
|
||||||
|
*/
|
||||||
|
SingleResponse<String> importTemplate();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,4 +73,9 @@ auth:
|
||||||
deptId:
|
deptId:
|
||||||
org: 2069624650907299840
|
org: 2069624650907299840
|
||||||
roleId:
|
roleId:
|
||||||
org: 2074857068268802050
|
org: 2074857068268802050
|
||||||
|
|
||||||
|
template:
|
||||||
|
personnel:
|
||||||
|
import:
|
||||||
|
url:
|
||||||
|
|
@ -74,4 +74,9 @@ auth:
|
||||||
deptId:
|
deptId:
|
||||||
org: 2069596397920849920
|
org: 2069596397920849920
|
||||||
roleId:
|
roleId:
|
||||||
org: 2069671307598893058
|
org: 2069671307598893058
|
||||||
|
|
||||||
|
template:
|
||||||
|
personnel:
|
||||||
|
import:
|
||||||
|
url:
|
||||||
Loading…
Reference in New Issue