添加注解

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -137,22 +137,22 @@ public class ExcelController extends BaseController {
     OrgUsrServiceImpl orgUsrService;
     @Autowired
     IDutyPersonService iDutyPersonService;
-    
+
     @Autowired
-	IMaintenanceCompanyService maintenanceCompanyService;
-    
+    IMaintenanceCompanyService maintenanceCompanyService;
+
     @Autowired
     DynamicFormColumnServiceImpl dynamicFormColumnService;
-    
+
     @Autowired
-	Sequence sequence;
-    
+    Sequence sequence;
+
     @Autowired
     IKeySiteService keySiteService;
 
     private static final String NOT_DUTY = "休班";
     private static final String PERSON = "PERSON";
-    
+
     private static final String MAINTENANCE_PERSON = "maintenancePerson";
 
 
@@ -214,14 +214,15 @@ public class ExcelController extends BaseController {
                             firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
                     break;
                 case ExcelEnums.WBRY:
-                    List<MaintenancePersonExcleDto> maintenancePersonExcleDtoList = maintenanceCompanyService.exportToMaintenancePersonExcel();
+                    List<MaintenancePersonExcleDto> maintenancePersonExcleDtoList =
+                            maintenanceCompanyService.exportToMaintenancePersonExcel();
                     ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
-                    		maintenancePersonExcleDtoList, MaintenancePersonExcleDto.class, null, false);
+                            maintenancePersonExcleDtoList, MaintenancePersonExcleDto.class, null, false);
                     break;
                 case ExcelEnums.KEYSITE:
-                	List<KeySiteExcleDto> keySiteDtoList = keySiteService.exportToExcel();
+                    List<KeySiteExcleDto> keySiteDtoList = keySiteService.exportToExcel();
                     ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
-                    		keySiteDtoList, KeySiteExcleDto.class, null, false);
+                            keySiteDtoList, KeySiteExcleDto.class, null, false);
                     break;
             }
         } catch (Exception e) {
@@ -266,66 +267,67 @@ public class ExcelController extends BaseController {
                 case ExcelEnums.WBRY:
                     excelImportMaintenancePerson(multipartFile, ExcelEnums.WBRY);
                 case ExcelEnums.KEYSITE:
-                	excelImportkeySite(multipartFile, ExcelEnums.KEYSITE);
+                    excelImportkeySite(multipartFile, ExcelEnums.KEYSITE);
             }
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("系统异常！");
         }
     }
-    
+
     /**
-     * @author chenhao 
      * @param multipartFile
      * @param wbry
      * @throws Exception
+     * @author chenhao
      */
     @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,
-        		KeySiteExcleDto.class, 1);
-        keySiteService.saveExcle( excelDtoList);
-	}
-    
-    
-    
+                KeySiteExcleDto.class, 1);
+        keySiteService.saveExcle(excelDtoList);
+    }
+
+
     /**
-     * @author chenhao 
      * @param multipartFile
      * @param wbry
-     * @throws Exception 
+     * @throws Exception
+     * @author chenhao
      */
     private void excelImportMaintenancePerson(MultipartFile multipartFile, String wbry) throws Exception {
-          List<MaintenancePersonExcleDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
-        		  MaintenancePersonExcleDto.class, 1);
-          List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, MAINTENANCE_PERSON));
-          List<MaintenanceCompany> maintenanceCompanyList = new ArrayList<MaintenanceCompany>();
-          List<DynamicFormInstance> dynamicFormInstanceList = new ArrayList<DynamicFormInstance>();
-          for (MaintenancePersonExcleDto maintenancePersonExcleDto : excelDtoList) {
-        	  Long instanceId = sequence.nextId();
-        	// 先填充主表的属性
-      		MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
-      		maintenanceCompany = Bean.toPo(maintenancePersonExcleDto, maintenanceCompany);
-      		maintenanceCompany.setType(PERSON);
-      		if (maintenanceCompany.getParentId() != null) {
-      			long getParentId = Long.valueOf(maintenancePersonExcleDto.getParentName().split("@")[1]);
-      			maintenanceCompany.setParentId(getParentId);
-      		}
-      		if (maintenanceCompanyService.checkPersonCodeExists(maintenancePersonExcleDto.getCode())) {
-      			maintenanceCompany.setCode(maintenancePersonExcleDto.getCode());
-      		} else {
-      			maintenanceCompany.setCode(null);
-      		}
-      		maintenanceCompany.setOrgCode(null);
-    		maintenanceCompany.setBizCode(sequence.nextId() + "");
-      		maintenanceCompany.setInstanceId(instanceId);
-      		maintenanceCompanyList.add(maintenanceCompany);
-      		maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,maintenancePersonExcleDto, instanceId, dynamicFormInstanceList);
-		}
-          maintenanceCompanyService.saveMaintenanceCompanyBatch(maintenanceCompanyList,dynamicFormInstanceList);
-	}
-
-	private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType) throws Exception {
+        List<MaintenancePersonExcleDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
+                MaintenancePersonExcleDto.class, 1);
+        List<DynamicFormColumn> columns =
+                dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, MAINTENANCE_PERSON));
+        List<MaintenanceCompany> maintenanceCompanyList = new ArrayList<MaintenanceCompany>();
+        List<DynamicFormInstance> dynamicFormInstanceList = new ArrayList<DynamicFormInstance>();
+        for (MaintenancePersonExcleDto maintenancePersonExcleDto : excelDtoList) {
+            Long instanceId = sequence.nextId();
+            // 先填充主表的属性
+            MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
+            maintenanceCompany = Bean.toPo(maintenancePersonExcleDto, maintenanceCompany);
+            maintenanceCompany.setType(PERSON);
+            if (maintenanceCompany.getParentId() != null) {
+                long getParentId = Long.valueOf(maintenancePersonExcleDto.getParentName().split("@")[1]);
+                maintenanceCompany.setParentId(getParentId);
+            }
+            if (maintenanceCompanyService.checkPersonCodeExists(maintenancePersonExcleDto.getCode())) {
+                maintenanceCompany.setCode(maintenancePersonExcleDto.getCode());
+            } else {
+                maintenanceCompany.setCode(null);
+            }
+            maintenanceCompany.setOrgCode(null);
+            maintenanceCompany.setBizCode(sequence.nextId() + "");
+            maintenanceCompany.setInstanceId(instanceId);
+            maintenanceCompanyList.add(maintenanceCompany);
+            maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,
+                    maintenancePersonExcleDto, instanceId, dynamicFormInstanceList);
+        }
+        maintenanceCompanyService.saveMaintenanceCompanyBatch(maintenanceCompanyList, dynamicFormInstanceList);
+    }
+
+    private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType) throws Exception {
 
         String fileName = multipartFile.getOriginalFilename();
         if (fileName == null) {
@@ -683,6 +685,15 @@ public class ExcelController extends BaseController {
         fireExpertsServiceImpl.saveBatch(excelEntityList);
     }
 
+    /**
+     * 导出值班模板
+     *
+     * @param response
+     * @param beginDate 值班开始日期
+     * @param endDate   值班结束日期
+     * @param excelDto  导出类型参数
+     * @param ids       部门或队伍的id列表，逗号分隔
+     */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "导出值班模板", notes = "导出值班模板")
     @GetMapping(value = "/duty_template")