Browse Source

部门导入,微测试

master
yinzuomei 2 years ago
parent
commit
2e68db40a9
  1. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
  2. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java

@ -235,7 +235,7 @@ public class DepartmentController implements ResultDataResolver {
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("部门导入模版", "UTF-8") + ".xlsx");
InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/yantai/yantai_dept_import_tem.xlsx.xlsx");
InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/yantai/yantai_dept_import_tem.xlsx");
try {
ServletOutputStream os = response.getOutputStream();
IOUtils.copy(is, os);

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@ -573,8 +573,11 @@ public class DepartmentServiceImpl implements DepartmentService {
@Async
@Override
public void execAsyncExcelImport(Path filePath, String importTaskId,String agencyId,String originalFilename) {
CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(agencyId);
if (null == agencyEntity) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "组织不存在,agencyId" + agencyId, "只有组织才可以导入部门");
}
try {
CustomerAgencyEntity agencyEntity=customerAgencyDao.selectById(agencyId);
DeptExcelImportListener listener = new DeptExcelImportListener(EpmetRequestHolder.getLoginUserCustomerId(),
EpmetRequestHolder.getLoginUserId(),
agencyEntity,

Loading…
Cancel
Save