人员导出

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -745,7 +745,7 @@ public class ExcelServiceImpl {
 							}
 						}
 					}
-					if ("birthdayTime".equals(key)) {
+					if ("birthdayTime".equals(key) && !ObjectUtils.isEmpty(value)) {
 						SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 						try {
 							String date = ft.format(value);
@@ -754,6 +754,11 @@ public class ExcelServiceImpl {
 							logger.error("日期转换失败");
 						}
 					}
+					if ("peopleType".equals(key)) {
+						dynamicFormInstanceDto.setFieldValue("1");
+						dynamicFormInstanceDto.setFieldValueLabel("非消防人员");
+						orgUsrExcelDto.setPeopleType("1");
+					}
 					DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
 					BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
 					dynamicFormInstancelist.add(dynamicFormInstance);