Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 
 import java.io.Serializable;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
@@ -16,6 +17,7 @@ public class MaintenancePersonExcleDto implements Serializable {
 	/**
 	* 
 	*/
+	@ExcelIgnore
 	private static final long serialVersionUID = 1L;
 
 	@ExcelProperty(value = "序号", index = 0)
@@ -31,10 +33,12 @@ public class MaintenancePersonExcleDto implements Serializable {
 	protected String  code;
 	
 	@ExplicitConstraint(indexNum = 3,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
+	@ExcelProperty(value = "所属单位及部门", index =3)
 	@ApiModelProperty(value = "所属单位及部门")	
 	private String parentId;
 	
-	@ExplicitConstraint(type = "XB", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class)
+	@ExplicitConstraint(type = "XB", indexNum = 4, sourceClass = RoleNameExplicitConstraint.class)
+	@ExcelProperty(value = "性别", index =4)
 	@ApiModelProperty(value = "性别")	
 	private String gender;
 	
@@ -60,14 +64,17 @@ public class MaintenancePersonExcleDto implements Serializable {
 	private String systemAccount;
 	
 	@ExplicitConstraint(type = "WBRYZT", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "人员状态", index =10)
 	@ApiModelProperty(value = "人员状态")	
 	private String status;
 	
 	@ExplicitConstraint(type = "WBZYZS", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "职业资格证书", index =11)
 	@ApiModelProperty(value = "职业资格证书")	
 	private String professionalCertificate;
 
 	@ExplicitConstraint(type = "WBZYZG", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "职业资格", index =12)
 	@ApiModelProperty(value = "职业资格")	
 	private String qualification;
 	

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IMaintenanceCompanyService.java

@@ -8,7 +8,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 /**
  * 维保单位接口类
@@ -157,4 +156,10 @@ public interface IMaintenanceCompanyService {
 	 * @return
 	 */
 	public boolean saveMaintenanceCompanyBatch(List<MaintenanceCompany> companyList, List<DynamicFormInstance> list);
+	/**
+	 * 将所有的维保人员导入到excle中
+	 * @return
+	 */
+	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel(); 
+
 }