提交维保人员excle导出的功能 by chenhao

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/MaintenancePersonExcleDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -20,77 +21,81 @@ public class MaintenancePersonExcleDto implements Serializable {
 	@ExcelIgnore
 	private static final long serialVersionUID = 1L;
 
-	@ExcelProperty(value = "序号", index = 0)
+	//@ExcelProperty(value = "序号", index = 0)
 	@ApiModelProperty(value = "序号")
+	@ExcelIgnore
 	private Integer number;
 
-	@ExcelProperty(value = "姓名", index = 1)
+	@ExcelProperty(value = "姓名", index = 0)
 	@ApiModelProperty(value = "姓名")
 	private String name;
 
-	@ExcelProperty(value = "员工编号", index =2)
+	@ExcelProperty(value = "员工编号", index =1)
 	@ApiModelProperty(value = "员工编号")
 	protected String  code;
 	
-	@ExplicitConstraint(indexNum = 3,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
-	@ExcelProperty(value = "所属单位及部门", index =3)
+	@ExplicitConstraint(indexNum = 2,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
+	@ExcelProperty(value = "所属单位及部门", index =2)
 	@ApiModelProperty(value = "所属单位及部门")	
-	private String parentId;
+	private String parentName;
+	
+	@ExcelIgnore
+	private Long parentId;
 	
-	@ExplicitConstraint(type = "XB", indexNum = 4, sourceClass = RoleNameExplicitConstraint.class)
-	@ExcelProperty(value = "性别", index =4)
+	@ExplicitConstraint(type = "XB", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class)
+	@ExcelProperty(value = "性别", index =3)
 	@ApiModelProperty(value = "性别")	
 	private String gender;
 	
-	@ExcelProperty(value = "身份证号码", index =5)	
+	@ExcelProperty(value = "身份证号码", index =4)	
 	@ApiModelProperty(value = "身份证号码")
 	private String	idNumber;
 	
-	@ExcelProperty(value = "手机号码", index =6)	
+	@ExcelProperty(value = "手机号码", index =5)	
 	@ApiModelProperty(value = "手机号码")	
 	private String tel;
 	
-	@ExcelProperty(value = "民族", index =7)	
+	@ExcelProperty(value = "民族", index =6)	
 	@ApiModelProperty(value = "民族")	
 	private String nation;
 	
 	//项目负责人、消防设施操作员
-	@ExcelProperty(value = "类别", index =8)	
+	@ExcelProperty(value = "类别", index =7)	
 	@ApiModelProperty(value = "类别")	
 	private String category;
 	
-	@ExcelProperty(value = "统账号", index = 9)
+	@ExcelProperty(value = "统账号", index = 8)
 	@ApiModelProperty(value = "系统账户")	
 	private String systemAccount;
 	
-	@ExplicitConstraint(type = "WBRYZT", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-	@ExcelProperty(value = "人员状态", index =10)
+	@ExplicitConstraint(type = "WBRYZT", indexNum =9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "人员状态", index =9)
 	@ApiModelProperty(value = "人员状态")	
 	private String status;
 	
-	@ExplicitConstraint(type = "WBZYZS", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-	@ExcelProperty(value = "职业资格证书", index =11)
+	@ExplicitConstraint(type = "WBZYZS", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "职业资格证书", index =10)
 	@ApiModelProperty(value = "职业资格证书")	
 	private String professionalCertificate;
 
-	@ExplicitConstraint(type = "WBZYZG", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-	@ExcelProperty(value = "职业资格", index =12)
+	@ExplicitConstraint(type = "WBZYZG", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "职业资格", index =11)
 	@ApiModelProperty(value = "职业资格")	
 	private String qualification;
 	
-	@ExcelProperty(value = "证书编号", index =13)
+	@ExcelProperty(value = "证书编号", index =12)
 	@ApiModelProperty(value = "证书编号")
 	private String certificateNo;
 	
-	@ExcelProperty(value = "注册有效期开始时间", index = 14)
+	@ExcelProperty(value = "注册有效期开始时间", index = 13)
 	@ApiModelProperty(value = "注册有效期开始时间")	
-	private String registrationStartTime;
+	private Date registrationStartTime;
 	
-	@ExcelProperty(value = "注册有效期结束时间", index = 15)
+	@ExcelProperty(value = "注册有效期结束时间", index = 14)
 	@ApiModelProperty(value = "注册有效期结束时间")	
-	private String registrationEndTime;
+	private Date registrationEndTime;
 	
-	@ExcelProperty(value = "注册号", index = 16)
+	@ExcelProperty(value = "注册号", index = 15)
 	@ApiModelProperty(value = "注册号")
 	private String amosAccount;
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/MaintenanceCompanyController.java

@@ -112,7 +112,6 @@ public class MaintenanceCompanyController extends BaseController {
 	@GetMapping(value = "/allList")
 	@ApiOperation(httpMethod = "GET", value = "所有维保人员/单位/部门列表，不分页", notes = "所有维保人员列表")
 	public ResponseModel<List<Map<String, Object>>> getAllMaintenanceList(@RequestParam String maintenanceType) {
-		AgencyUserModel amosUser = getUserInfo();
 		return ResponseHelper.buildResponse(maintenanceCompanyService.getAllMaintenanceList(maintenanceType));
 	}
 

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

@@ -208,6 +208,11 @@ public class ExcelController extends BaseController {
                     ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
                             firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
                     break;
+                case ExcelEnums.WBRY:
+                    List<MaintenancePersonExcleDto> maintenancePersonExcleDtoList = maintenanceCompanyService.exportToMaintenancePersonExcel();
+                    ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                    		maintenancePersonExcleDtoList, MaintenancePersonExcleDto.class, null, false);
+                    break;
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -275,7 +280,7 @@ public class ExcelController extends BaseController {
       		maintenanceCompany = Bean.toPo(maintenancePersonExcleDto, maintenanceCompany);
       		maintenanceCompany.setType(PERSON);
       		if (maintenanceCompany.getParentId() != null) {
-      			long getParentId = Long.valueOf(maintenancePersonExcleDto.getParentId().split("@")[1]);
+      			long getParentId = Long.valueOf(maintenancePersonExcleDto.getParentName().split("@")[1]);
       			maintenanceCompany.setParentId(getParentId);
       		}
       		if (maintenanceCompanyService.checkPersonCodeExists(maintenancePersonExcleDto.getCode())) {
@@ -283,6 +288,8 @@ public class ExcelController extends BaseController {
       		} else {
       			maintenanceCompany.setCode(null);
       		}
+      		maintenanceCompany.setOrgCode(null);
+    		maintenanceCompany.setBizCode(sequence.nextId() + "");
       		maintenanceCompany.setInstanceId(instanceId);
       		maintenanceCompanyList.add(maintenanceCompany);
       		maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,maintenancePersonExcleDto, instanceId, dynamicFormInstanceList);