Skip to content

A
amos-boot-biz
Commit f4d3e470 authored by lisong's avatar lisong
Browse files
Options

机场代码同步

parent 76e7172d
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 39 deletions
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
View file @ f4d3e470
...@@ -776,20 +776,17 @@ public class ExcelServiceImpl { ...@@ -776,20 +776,17 @@ public class ExcelServiceImpl {
// 获取对象属性和值 // 获取对象属性和值
Field[] fields = orgUsrExcelDto.getClass().getDeclaredFields(); Field[] fields = orgUsrExcelDto.getClass().getDeclaredFields();
for (Field field : fields) { for (Field field : fields) {
try { try{
field.setAccessible(true); field.setAccessible(true);
Object value = field.get(orgUsrExcelDto); Object value = field.get(orgUsrExcelDto);
String name = field.getName(); String name = field.getName();
// 解析注解信息 // 解析注解信息
ExplicitConstraint explicitConstraint = field.getAnnotation(ExplicitConstraint.class); ExplicitConstraint explicitConstraint = field.getAnnotation(ExplicitConstraint.class);
if (!ObjectUtils.isEmpty(explicitConstraint)) { if (!ObjectUtils.isEmpty(explicitConstraint)) {
name = name + "@"; name = name + "@";
} }
map.put(name, value); map.put(name, value);
} catch (Exception ex) { } catch (Exception ex){
logger.error("获取{}字段值失败, {}", field.getName(), ex); logger.error("获取{}字段值失败, {}", field.getName(), ex);
} }
} }
...@@ -797,6 +794,7 @@ public class ExcelServiceImpl { ...@@ -797,6 +794,7 @@ public class ExcelServiceImpl {
Map map1 = JSONObject.parseObject(s, Map.class); Map map1 = JSONObject.parseObject(s, Map.class);
List<DynamicFormInstanceDto> dynamicFormValue = new ArrayList<>(); List<DynamicFormInstanceDto> dynamicFormValue = new ArrayList<>();
List<DynamicFormInstance> dynamicFormInstancelist = new ArrayList<>(); List<DynamicFormInstance> dynamicFormInstancelist = new ArrayList<>();
dynamicFormColumn.forEach(DynamicFormInitDto -> { dynamicFormColumn.forEach(DynamicFormInitDto -> {
if ("birthdayTime".equals(DynamicFormInitDto.getKey())) { if ("birthdayTime".equals(DynamicFormInitDto.getKey())) {
DynamicFormInstanceDto formItemDescr = DynamicFormInitDto.getFormItemDescr(); DynamicFormInstanceDto formItemDescr = DynamicFormInitDto.getFormItemDescr();
...@@ -804,24 +802,11 @@ public class ExcelServiceImpl { ...@@ -804,24 +802,11 @@ public class ExcelServiceImpl {
DynamicFormInitDto.setFormItemDescr(formItemDescr); DynamicFormInitDto.setFormItemDescr(formItemDescr);
} }
dynamicFormValue.add(DynamicFormInitDto.getFormItemDescr()); dynamicFormValue.add(DynamicFormInitDto.getFormItemDescr());
}); });
dynamicFormValue.forEach(dynamicFormInstanceDto -> { dynamicFormValue.forEach(dynamicFormInstanceDto -> {
String key = dynamicFormInstanceDto.getFieldCode(); String key = dynamicFormInstanceDto.getFieldCode();
if (map.containsKey(key) && map.get(key) != null) {
String o = map.get(key).toString(); if (map1.containsKey(key)){
if ("birthdayTime".equals(key) && !ObjectUtils.isEmpty(o)) {
SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
String date = ft.format(o);
dynamicFormInstanceDto.setFieldValue(date);
} catch (Exception e) {
logger.error("日期转换失败");
throw new RuntimeException("出生日期格式不对!");
}
}
}
if (map1.containsKey(key)) {
String value = map1.get(key).toString(); String value = map1.get(key).toString();
if (value.contains("@")) { if (value.contains("@")) {
String[] certificates = value.split("@"); String[] certificates = value.split("@");
...@@ -831,36 +816,56 @@ public class ExcelServiceImpl { ...@@ -831,36 +816,56 @@ public class ExcelServiceImpl {
dynamicFormInstanceDto.setFieldValue(value); dynamicFormInstanceDto.setFieldValue(value);
} }
} }
if (map.containsKey(key) && map.get(key) != null){
if ("birthdayTime".equals(key) || "holdingTime".equals(key) ) {
Date o = (Date) map.get(key);
SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
String format = dtf.format(o);
try {
// String date = ft.format(o);
dynamicFormInstanceDto.setFieldValue(format);
} catch (Exception e) {
logger.error("日期转换失败");
throw new RuntimeException("出生日期格式不对!");
}
}
}
DynamicFormInstance dynamicFormInstance = new DynamicFormInstance(); DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance); BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
if ("gender".equals(dynamicFormInstance.getFieldCode())) { String fieldCode = dynamicFormInstance.getFieldCode();
if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue())) ? "男" : "女"); dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
} }
if ("positionType".equals(dynamicFormInstance.getFieldCode())) { if ("gender".equals(dynamicFormInstance.getFieldCode())){
dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName()); dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
} }
String fieldCode = dynamicFormInstance.getFieldCode(); if ("positionType".equals(dynamicFormInstance.getFieldCode())){
if (map1.containsKey(fieldCode) && fieldCode.contains("Code")) { dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
String[] split = map1.get(fieldCode).toString().split("@");
dynamicFormInstance.setFieldValue(split[0]);
} }
if ("certificatesTypeCode".equals(fieldCode)) { if ("certificatesTypeCode".equals(fieldCode)){
String[] split = map1.get(fieldCode).toString().split("@"); String[] split = map1.get(fieldCode).toString().split("@");
dynamicFormInstance.setFieldValue(split[1]); dynamicFormInstance.setFieldValue(split[1]);
dynamicFormInstance.setFieldValueLabel(split[0]); dynamicFormInstance.setFieldValueLabel(split[0]);}
} if ("residenceDetailsCode".equals(fieldCode) && map1.get("residenceDetails") != null) {
if (map1.containsKey(fieldCode.substring(0, fieldCode.length() - 4))) { String[] residenceDetails = map1.get("residenceDetails").toString().split("@");
dynamicFormInstance.setFieldValue(residenceDetails[1]);
dynamicFormInstance.setFieldValueLabel(residenceDetails[0]);
}
if ("nativePlaceCode".equals(fieldCode)&& map1.get("nativePlace") != null){
String[] split = map1.get("nativePlace").toString().split("@");
dynamicFormInstance.setFieldValue(split[1]);
dynamicFormInstance.setFieldValueLabel(split[0]);}
dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0, fieldCode.length() - 4)).toString());
}
dynamicFormInstancelist.add(dynamicFormInstance); dynamicFormInstancelist.add(dynamicFormInstance);
}); });
orgUsrExcelDto.setDynamicFormValue(dynamicFormInstancelist); orgUsrExcelDto.setDynamicFormValue(dynamicFormInstancelist);
Bean.toPo(getCurrentInfo(), orgUsrExcelDto); Bean.toPo(getCurrentInfo(), orgUsrExcelDto);
// 保存动态表单和人员单位表 // 保存动态表单和人员单位表
String[] split55 = orgUsrExcelDto.getCertificatesTypeCode().toString().split("@"); String[] split55 = orgUsrExcelDto.getCertificatesTypeCode().toString().split("@");
if (!ObjectUtils.isEmpty(orgUsrExcelDto.getCertificatesNumber()) && split55[1].equals("120")) { if (!ObjectUtils.isEmpty(orgUsrExcelDto.getCertificatesNumber())&&split55[1].equals("120")) {
if (!set.add(orgUsrExcelDto.getCertificatesNumber())) { if (!set.add(orgUsrExcelDto.getCertificatesNumber())) {
throw new RuntimeException("身份证号码重复!"); throw new RuntimeException("身份证号码重复!");
} else { } else {
...@@ -870,14 +875,16 @@ public class ExcelServiceImpl { ...@@ -870,14 +875,16 @@ public class ExcelServiceImpl {
} }
} }
} }
//平台用户唯一效验 //平台用户唯一效验
if (!ObjectUtils.isEmpty(orgUsrExcelDto.getAmosOrgId())) { if (!ObjectUtils.isEmpty(orgUsrExcelDto.getAmosOrgId())) {
if (!set1.add(orgUsrExcelDto.getAmosOrgId())) { if (!set1.add(orgUsrExcelDto.getAmosOrgId())) {
throw new RuntimeException("关联用户" + orgUsrExcelDto.getAmosOrgCode() + "重复!"); throw new RuntimeException("关联用户"+orgUsrExcelDto.getAmosOrgCode()+"重复!");
} else { } else {
int num = orgUsrMapper.amosIdExist(orgUsrExcelDto.getAmosOrgId(), null); int num = orgUsrMapper.amosIdExist(orgUsrExcelDto.getAmosOrgId(),null);
if (num > 0) { if (num > 0) {
throw new RuntimeException("关联用户" + orgUsrExcelDto.getAmosOrgCode() + "重复!"); throw new RuntimeException("关联用户"+orgUsrExcelDto.getAmosOrgCode()+"重复!");
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment