添加excle导入导出的功能修改

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)
@@ -30,11 +32,13 @@ public class MaintenancePersonExcleDto implements Serializable {
 	@ApiModelProperty(value = "员工编号")
 	protected String  code;
 	
-	@ExplicitConstraint(indexNum = 3, sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
+	@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

@@ -158,5 +158,10 @@ public interface IMaintenanceCompanyService {
 	 * @return
 	 */
 	public boolean saveMaintenanceCompanyBatch(List<MaintenanceCompany> companyList, List<DynamicFormInstance> list);
+	/**
+	 * 将所有的维保人员导入到excle中
+	 * @return
+	 */
+	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel(); 
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -22,6 +22,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
@@ -58,11 +59,6 @@ public class MaintenanceCompanyServiceImpl
 	private static final String COMPANY = "COMPANY";
 	private static final String DEPARTMENT = "DEPARTMENT";
 
-//	private static final String[] INFORMATION_CARD_ARRAY = { "resourcesAdress", "name", "qualification",
-//			"professionalCertificate", "tel" };
-//	private static final String[] INFORMATION_DATA_ITEM = { "resourcesAdress", "name", "age", "qualification",
-//			"professionalCertificate", "tel", "systemAccount" };
-
 	@Autowired
 	DynamicFormInstanceServiceImpl dynamicFormInstanceService;
 
@@ -204,8 +200,9 @@ public class MaintenanceCompanyServiceImpl
 		int number = maintenanceCompanyMapper.update(maintenanceCompany, wrapper);
 		if (number > 0) {
 			// 更新动态表单字段为删除状态
-			List<DynamicFormInstance> dyInstance =
-					dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, maintenanceCompany.getInstanceId()));
+			List<DynamicFormInstance> dyInstance = dynamicFormInstanceService
+					.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId,
+							maintenanceCompany.getInstanceId()));
 			dyInstance.forEach(i -> i.setIsDelete(true));
 			dynamicFormInstanceService.updateBatchById(dyInstance);
 
@@ -267,6 +264,12 @@ public class MaintenanceCompanyServiceImpl
 		return dynamicFormList;
 	}
 
+	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel() {
+		List<Map<String, Object>> list = this.getAllMaintenanceList(PERSON);
+		return JSONArray.parseArray(list.toString(), MaintenancePersonExcleDto.class);
+
+	}
+
 	/**
 	 * 维保单位人员信息分頁信息显示时的字段过滤
 	 * 
@@ -332,8 +335,8 @@ public class MaintenanceCompanyServiceImpl
 			wrapper.eq(MaintenanceCompany::getType, maintenanceType.toUpperCase());
 			mainTableList = this.list(wrapper);
 			break;
-			default:
-				throw new IllegalStateException("Unexpected maintenanceType: " + maintenanceType);
+		default:
+			throw new IllegalStateException("Unexpected maintenanceType: " + maintenanceType);
 		}
 		if (StringUtils.isBlank(type)) {
 			return null;
@@ -353,7 +356,7 @@ public class MaintenanceCompanyServiceImpl
 	}
 
 	public List<MaintenanceCompany> checkMaintenanceCompanyList(LambdaQueryWrapper<MaintenanceCompany> wrapper,
-																Map<String, Object> paramsMap) {
+			Map<String, Object> paramsMap) {
 		if (paramsMap.containsKey("name")) {
 			wrapper.likeRight(MaintenanceCompany::getName, paramsMap.get("name").toString());
 		}
@@ -370,14 +373,14 @@ public class MaintenanceCompanyServiceImpl
 		MaintenanceCompany maintenanceCompany = maintenanceCompanyMapper.selectById(sequenceNbr);
 		String type;
 		switch (maintenanceCompany.getType()) {
-			case PERSON:
-				type = MAINTENANCE_PERSON;
-				break;
-			case DEPARTMENT:
-				type = MAINTENANCE_DEPARTMENT;
-				break;
-			default:
-				type = MAINTENANCE_COMPANY;
+		case PERSON:
+			type = MAINTENANCE_PERSON;
+			break;
+		case DEPARTMENT:
+			type = MAINTENANCE_DEPARTMENT;
+			break;
+		default:
+			type = MAINTENANCE_COMPANY;
 		}
 		Map<String, Object> mainMap = Bean.BeantoMap(maintenanceCompany);
 		Map<String, Object> dynamicMap = dynamicFormInstanceService.getOneMap(maintenanceCompany.getInstanceId(), type);
@@ -692,5 +695,4 @@ public class MaintenanceCompanyServiceImpl
 		return false;
 	}
 
-
 }
\ No newline at end of file