Commit 208d4928 authored by 付培阳's avatar 付培阳

添加注解

parent a69e35cd
...@@ -214,7 +214,8 @@ public class ExcelController extends BaseController { ...@@ -214,7 +214,8 @@ public class ExcelController extends BaseController {
firefightersExcelDtoList, FirefightersExcelDto.class, null, false); firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
break; break;
case ExcelEnums.WBRY: case ExcelEnums.WBRY:
List<MaintenancePersonExcleDto> maintenancePersonExcleDtoList = maintenanceCompanyService.exportToMaintenancePersonExcel(); List<MaintenancePersonExcleDto> maintenancePersonExcleDtoList =
maintenanceCompanyService.exportToMaintenancePersonExcel();
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
maintenancePersonExcleDtoList, MaintenancePersonExcleDto.class, null, false); maintenancePersonExcleDtoList, MaintenancePersonExcleDto.class, null, false);
break; break;
...@@ -275,30 +276,30 @@ public class ExcelController extends BaseController { ...@@ -275,30 +276,30 @@ public class ExcelController extends BaseController {
} }
/** /**
* @author chenhao
* @param multipartFile * @param multipartFile
* @param wbry * @param wbry
* @throws Exception * @throws Exception
* @author chenhao
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
private void excelImportkeySite(MultipartFile multipartFile, String wbry) throws Exception { private void excelImportkeySite(MultipartFile multipartFile, String wbry) throws Exception {
List<KeySiteExcleDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, List<KeySiteExcleDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
KeySiteExcleDto.class, 1); KeySiteExcleDto.class, 1);
keySiteService.saveExcle( excelDtoList); keySiteService.saveExcle(excelDtoList);
} }
/** /**
* @author chenhao
* @param multipartFile * @param multipartFile
* @param wbry * @param wbry
* @throws Exception * @throws Exception
* @author chenhao
*/ */
private void excelImportMaintenancePerson(MultipartFile multipartFile, String wbry) throws Exception { private void excelImportMaintenancePerson(MultipartFile multipartFile, String wbry) throws Exception {
List<MaintenancePersonExcleDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, List<MaintenancePersonExcleDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
MaintenancePersonExcleDto.class, 1); MaintenancePersonExcleDto.class, 1);
List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, MAINTENANCE_PERSON)); List<DynamicFormColumn> columns =
dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, MAINTENANCE_PERSON));
List<MaintenanceCompany> maintenanceCompanyList = new ArrayList<MaintenanceCompany>(); List<MaintenanceCompany> maintenanceCompanyList = new ArrayList<MaintenanceCompany>();
List<DynamicFormInstance> dynamicFormInstanceList = new ArrayList<DynamicFormInstance>(); List<DynamicFormInstance> dynamicFormInstanceList = new ArrayList<DynamicFormInstance>();
for (MaintenancePersonExcleDto maintenancePersonExcleDto : excelDtoList) { for (MaintenancePersonExcleDto maintenancePersonExcleDto : excelDtoList) {
...@@ -320,9 +321,10 @@ public class ExcelController extends BaseController { ...@@ -320,9 +321,10 @@ public class ExcelController extends BaseController {
maintenanceCompany.setBizCode(sequence.nextId() + ""); maintenanceCompany.setBizCode(sequence.nextId() + "");
maintenanceCompany.setInstanceId(instanceId); maintenanceCompany.setInstanceId(instanceId);
maintenanceCompanyList.add(maintenanceCompany); maintenanceCompanyList.add(maintenanceCompany);
maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,maintenancePersonExcleDto, instanceId, dynamicFormInstanceList); maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,
maintenancePersonExcleDto, instanceId, dynamicFormInstanceList);
} }
maintenanceCompanyService.saveMaintenanceCompanyBatch(maintenanceCompanyList,dynamicFormInstanceList); maintenanceCompanyService.saveMaintenanceCompanyBatch(maintenanceCompanyList, dynamicFormInstanceList);
} }
private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType) throws Exception { private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType) throws Exception {
...@@ -683,6 +685,15 @@ public class ExcelController extends BaseController { ...@@ -683,6 +685,15 @@ public class ExcelController extends BaseController {
fireExpertsServiceImpl.saveBatch(excelEntityList); fireExpertsServiceImpl.saveBatch(excelEntityList);
} }
/**
* 导出值班模板
*
* @param response
* @param beginDate 值班开始日期
* @param endDate 值班结束日期
* @param excelDto 导出类型参数
* @param ids 部门或队伍的id列表,逗号分隔
*/
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "导出值班模板", notes = "导出值班模板") @ApiOperation(value = "导出值班模板", notes = "导出值班模板")
@GetMapping(value = "/duty_template") @GetMapping(value = "/duty_template")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment