Skip to content

A
amos-boot-biz
Commit ada09e62 authored by 李成龙's avatar 李成龙
Browse files
Options

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

parents a69dc081 6ebe5512
Hide whitespace changes
Inline Side-by-side
Showing with 836 additions and 839 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormInitDto.java
View file @ ada09e62
...@@ -40,6 +40,7 @@ public class DynamicFormInitDto implements Serializable{ ...@@ -40,6 +40,7 @@ public class DynamicFormInitDto implements Serializable{
@ApiModelProperty(value = "接口地址") @ApiModelProperty(value = "接口地址")
private String columnConfig; private String columnConfig;
private int sort;
public DynamicFormInitDto() { public DynamicFormInitDto() {
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormColumnMapper.java
View file @ ada09e62
package com.yeejoin.amos.boot.module.common.api.mapper; package com.yeejoin.amos.boot.module.common.api.mapper;
import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn; import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
...@@ -11,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/ */
public interface DynamicFormColumnMapper extends BaseMapper<DynamicFormColumn> { public interface DynamicFormColumnMapper extends BaseMapper<DynamicFormColumn> {
List<DynamicFormInstanceDto> getDynamicFormInstanceList(String groupCode);
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormColumnServiceImpl.java
View file @ ada09e62
...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl; ...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -94,6 +95,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD ...@@ -94,6 +95,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
vo.setDefaultValue(date); vo.setDefaultValue(date);
} }
vo.setFormItemDescr(dynamicFormValue); vo.setFormItemDescr(dynamicFormValue);
vo.setSort(dynamicFormValue.getSort());
listfrom.add(vo); listfrom.add(vo);
} else { } else {
// 查询数据项 // 查询数据项
...@@ -119,6 +121,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD ...@@ -119,6 +121,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
} }
vo.setFormItemDescr(dynamicFormValue); vo.setFormItemDescr(dynamicFormValue);
vo.setSort(dynamicFormValue.getSort());
listfrom.add(vo); listfrom.add(vo);
break; break;
case "action": case "action":
...@@ -130,6 +133,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD ...@@ -130,6 +133,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
dynamicFormValue.setFormColumnId(dynamicForm.getSequenceNbr()); dynamicFormValue.setFormColumnId(dynamicForm.getSequenceNbr());
dynamicFormValue.setAppKey(appKey); dynamicFormValue.setAppKey(appKey);
vo.setFormItemDescr(dynamicFormValue); vo.setFormItemDescr(dynamicFormValue);
vo.setSort(dynamicFormValue.getSort());
listfrom.add(vo); listfrom.add(vo);
break; break;
case "dict": case "dict":
...@@ -153,6 +157,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD ...@@ -153,6 +157,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
} }
vo.setFormItemDescr(dynamicFormValue); vo.setFormItemDescr(dynamicFormValue);
vo.setSort(dynamicFormValue.getSort());
listfrom.add(vo); listfrom.add(vo);
break; break;
default: default:
...@@ -162,14 +167,14 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD ...@@ -162,14 +167,14 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
dynamicForm.getFieldCode(), dynamicForm.getBlock(), dynamicForm.getGroupCode()); dynamicForm.getFieldCode(), dynamicForm.getBlock(), dynamicForm.getGroupCode());
dynamicFormValue.setAppKey(appKey); dynamicFormValue.setAppKey(appKey);
vo.setFormItemDescr(dynamicFormValue); vo.setFormItemDescr(dynamicFormValue);
vo.setSort(dynamicFormValue.getSort());
listfrom.add(vo); listfrom.add(vo);
break; break;
} }
} }
}); });
return listfrom; return listfrom.stream().sorted(Comparator.comparing(DynamicFormInitDto::getSort)).collect(Collectors.toList());
} }
public List<SelectItem> getdata(Collection<DataDictionary> list) { public List<SelectItem> getdata(Collection<DataDictionary> list) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ ada09e62
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -27,7 +26,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -27,7 +26,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.constants.CommonConstant; import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormColumnDto;
import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto; import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto; import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
import com.yeejoin.amos.boot.module.common.api.dto.FormValue; import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
...@@ -56,839 +54,826 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; ...@@ -56,839 +54,826 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@Service @Service
public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapper> implements IOrgUsrService { public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapper> implements IOrgUsrService {
@Autowired @Autowired
DynamicFormInstanceServiceImpl alertFormValueServiceImpl; DynamicFormInstanceServiceImpl alertFormValueServiceImpl;
@Autowired @Autowired
DynamicFormColumnServiceImpl alertFormServiceImpl; DynamicFormColumnServiceImpl alertFormServiceImpl;
@Resource @Resource
OrgUsrMapper orgUsrMapper; OrgUsrMapper orgUsrMapper;
@Override @Override
public String selectUpUnitByParam(String id) { public String selectUpUnitByParam(String id) {
return this.baseMapper.selectUpUnitByParam(id); return this.baseMapper.selectUpUnitByParam(id);
} }
public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
List<OrgMenuDto> menuList = list.stream().map(o -> {
List<OrgMenuDto> menuList = list.stream().map(o -> { OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(), ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), false,
ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), o.getBizOrgCode());
false, o.getBizOrgCode()); return menu;
return menu; }).collect(Collectors.toList());
}).collect(Collectors.toList());
List<OrgMenuDto> result = new ArrayList<>();
List<OrgMenuDto> result = new ArrayList<>(); Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size()); menuList.forEach(e -> map.put(e.getKey(), e));
menuList.forEach(e -> map.put(e.getKey(), e)); Set<? extends Map.Entry<Long, ? extends OrgMenuDto>> entries = map.entrySet();
Set<? extends Map.Entry<Long, ? extends OrgMenuDto>> entries = map.entrySet(); entries.parallelStream().forEach(entry -> {
entries.parallelStream().forEach(entry -> { OrgMenuDto value = entry.getValue();
OrgMenuDto value = entry.getValue(); if (value != null) {
if (value != null) { OrgMenuDto treeDto = map.get(value.getParentId());
OrgMenuDto treeDto = map.get(value.getParentId()); if (treeDto != null) {
if (treeDto != null) { List<OrgMenuDto> children = treeDto.getChildren();
List<OrgMenuDto> children = treeDto.getChildren(); if (children == null) {
if (children == null) { children = new ArrayList<>();
children = new ArrayList<>(); treeDto.setChildren(children);
treeDto.setChildren(children); }
} children.add(value);
children.add(value); } else {
} else { result.add(value);
result.add(value); }
} }
} });
}); return result;
return result; }
}
@Override
@Override public List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName,
public List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName)
int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, throws Exception {
String OrgTypeMethodName) throws Exception { List<OrgMenuDto> resultList = new ArrayList<>();
List<OrgMenuDto> resultList = new ArrayList<>(); Class<?> clazz = Class.forName(packageURL);
Class<?> clazz = Class.forName(packageURL); Method IDMethodNameme = null;
Method IDMethodNameme = null; switch (IDHierarchy) {
switch (IDHierarchy) { case 1:
case 1: IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
IDMethodNameme = clazz.getDeclaredMethod(IDMethodName); break;
break; case 2:
case 2: IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName);
IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName); break;
break; case 3:
case 3: IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName);
IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName); break;
break; default:
default: IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
IDMethodNameme = clazz.getDeclaredMethod(IDMethodName); break;
break; }
}
Method NAMEMethodNameme = clazz.getDeclaredMethod(NAMEMethodName);
Method NAMEMethodNameme = clazz.getDeclaredMethod(NAMEMethodName); Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName); Method OrgTypeMethodNameme = clazz.getDeclaredMethod(OrgTypeMethodName);
Method OrgTypeMethodNameme = clazz.getDeclaredMethod(OrgTypeMethodName); // 获取顶层元素集合
//获取顶层元素集合 Long parentId;
Long parentId; for (Object ob : entityList) {
for (Object ob : entityList) {
Object entity = clazz.cast(ob);
Object entity = clazz.cast(ob);
parentId = PARENTIDMethodNameme.invoke(entity) != null
parentId = PARENTIDMethodNameme.invoke(entity) != null ? ? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity)))
Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null; : null;
if (parentId == null || topId == parentId) { if (parentId == null || topId == parentId) {
OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
String.valueOf(OrgTypeMethodNameme.invoke(entity)), false); String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
resultList.add(menu); resultList.add(menu);
} }
} }
//获取每个顶层元素的子数据集合 // 获取每个顶层元素的子数据集合
for (OrgMenuDto entity : resultList) { for (OrgMenuDto entity : resultList) {
entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy, entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy,
NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName)); NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
} }
return resultList; return resultList;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public List<OrgMenuDto> getSub(Long topId, @SuppressWarnings("rawtypes") Collection entityList, String packageURL public List<OrgMenuDto> getSub(Long topId, @SuppressWarnings("rawtypes") Collection entityList, String packageURL,
, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName,
String OrgTypeMethodName) throws Exception { String OrgTypeMethodName) throws Exception {
List<OrgMenuDto> childList = new ArrayList<>(); List<OrgMenuDto> childList = new ArrayList<>();
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
Class clazz = Class.forName(packageURL); Class clazz = Class.forName(packageURL);
Method IDMethodNameme = null; Method IDMethodNameme = null;
switch (IDHierarchy) { switch (IDHierarchy) {
case 1: case 1:
IDMethodNameme = clazz.getDeclaredMethod(IDMethodName); IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
break; break;
case 2: case 2:
IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName); IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName);
break; break;
case 3: case 3:
IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName); IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName);
break; break;
default: default:
IDMethodNameme = clazz.getDeclaredMethod(IDMethodName); IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
break; break;
} }
Method OrgTypeMethodNameme = clazz.getDeclaredMethod(OrgTypeMethodName); Method OrgTypeMethodNameme = clazz.getDeclaredMethod(OrgTypeMethodName);
Method NAMEMethodNameme = clazz.getDeclaredMethod(NAMEMethodName); Method NAMEMethodNameme = clazz.getDeclaredMethod(NAMEMethodName);
Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName); Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
Long parentId; Long parentId;
//子集的直接子对象 // 子集的直接子对象
for (Object ob : entityList) { for (Object ob : entityList) {
Object entity = clazz.cast(ob); Object entity = clazz.cast(ob);
parentId = PARENTIDMethodNameme.invoke(entity) != null ? parentId = PARENTIDMethodNameme.invoke(entity) != null
Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null; ? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity)))
: null;
if (parentId == null) {
if (topId == parentId) { if (parentId == null) {
OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), if (topId == parentId) {
String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
String.valueOf(OrgTypeMethodNameme.invoke(entity))); String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
childList.add(menu); String.valueOf(OrgTypeMethodNameme.invoke(entity)));
} childList.add(menu);
} else { }
if (topId.longValue() == parentId.longValue()) { } else {
OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), if (topId.longValue() == parentId.longValue()) {
String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
String.valueOf(OrgTypeMethodNameme.invoke(entity))); String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
childList.add(menu); String.valueOf(OrgTypeMethodNameme.invoke(entity)));
} childList.add(menu);
} }
}
}
}
//子集的间接子对象
for (OrgMenuDto entity : childList) { // 子集的间接子对象
entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy, for (OrgMenuDto entity : childList) {
NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName)); entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy,
if (entity.getChildren() != null) { NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
entity.setLeaf(false); if (entity.getChildren() != null) {
} entity.setLeaf(false);
} }
}
//递归退出条件
if (childList.size() == 0) { // 递归退出条件
return null; if (childList.size() == 0) {
} return null;
}
return childList;
} return childList;
}
@Override
public List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception { @Override
List<Map<String, Object>> companyPersonMsg = new ArrayList<>(); public List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception {
for (int i = 0; i < ids.size(); i++) { List<Map<String, Object>> companyPersonMsg = new ArrayList<>();
Map<String, Object> resultMap = new HashMap<>(); for (int i = 0; i < ids.size(); i++) {
// 查询出单位基本信息 Map<String, Object> resultMap = new HashMap<>();
OrgUsr company = getById(ids.get(i)); // 查询出单位基本信息
resultMap.put("id", company.getSequenceNbr()); OrgUsr company = getById(ids.get(i));
// 上级单位 resultMap.put("id", company.getSequenceNbr());
resultMap.put("upUnit", selectUpUnitByParam(company.getSequenceNbr() + "")); // 上级单位
// 当前单位 resultMap.put("upUnit", selectUpUnitByParam(company.getSequenceNbr() + ""));
resultMap.put("currentUnit", company.getBizOrgName()); // 当前单位
// 下级单位 resultMap.put("currentUnit", company.getBizOrgName());
Map<String, Object> downUnitColumnMap = new HashMap<>(); // 下级单位
downUnitColumnMap.put("is_delete", CommonConstant.IS_DELETE_00); Map<String, Object> downUnitColumnMap = new HashMap<>();
downUnitColumnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_COMPANY); downUnitColumnMap.put("is_delete", CommonConstant.IS_DELETE_00);
downUnitColumnMap.put("parent_id", company.getSequenceNbr()); downUnitColumnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_COMPANY);
QueryWrapper<OrgUsr> downUnitWrapper = new QueryWrapper<OrgUsr>(); downUnitColumnMap.put("parent_id", company.getSequenceNbr());
downUnitWrapper.allEq(downUnitColumnMap); QueryWrapper<OrgUsr> downUnitWrapper = new QueryWrapper<OrgUsr>();
List<OrgUsr> downList = list(downUnitWrapper); downUnitWrapper.allEq(downUnitColumnMap);
if (downList.size() == 0) { List<OrgUsr> downList = list(downUnitWrapper);
resultMap.put("downUnit", false); if (downList.size() == 0) {
} else { resultMap.put("downUnit", false);
resultMap.put("downUnit", true); } else {
} resultMap.put("downUnit", true);
// 人员数量 }
Map<String, Object> countPerson = new HashMap<>(); // 人员数量
countPerson.put("parent_id", company.getSequenceNbr()); Map<String, Object> countPerson = new HashMap<>();
countPerson.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON); countPerson.put("parent_id", company.getSequenceNbr());
QueryWrapper<OrgUsr> personNumWrapper = new QueryWrapper<OrgUsr>(); countPerson.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
personNumWrapper.allEq(countPerson); QueryWrapper<OrgUsr> personNumWrapper = new QueryWrapper<OrgUsr>();
int personNum = count(personNumWrapper); personNumWrapper.allEq(countPerson);
resultMap.put("personNum", personNum); int personNum = count(personNumWrapper);
if (0 == personNum) { resultMap.put("personNum", personNum);
continue; if (0 == personNum) {
} continue;
List<Map<String, Object>> personList = new ArrayList<>(); }
// 查询动态表单Phone List<Map<String, Object>> personList = new ArrayList<>();
Map<String, Object> phone = new HashMap<>(); // 查询动态表单Phone
phone.put("alert_called_id", company.getSequenceNbr()); Map<String, Object> phone = new HashMap<>();
phone.put("field_code", "companyPhone"); phone.put("alert_called_id", company.getSequenceNbr());
QueryWrapper<DynamicFormInstance> phoneWrapper = new QueryWrapper<DynamicFormInstance>(); phone.put("field_code", "companyPhone");
phoneWrapper.allEq(phone); QueryWrapper<DynamicFormInstance> phoneWrapper = new QueryWrapper<DynamicFormInstance>();
DynamicFormInstance phoneValue = alertFormValueServiceImpl.getOne(phoneWrapper); phoneWrapper.allEq(phone);
if (phoneValue == null) { DynamicFormInstance phoneValue = alertFormValueServiceImpl.getOne(phoneWrapper);
resultMap.put("tel", ""); if (phoneValue == null) {
} else { resultMap.put("tel", "");
resultMap.put("tel", phoneValue.getFieldValue()); } else {
} resultMap.put("tel", phoneValue.getFieldValue());
}
// 获取单位人员列表信息
personList = listPerson(company.getSequenceNbr() + "").stream().map(p -> { // 获取单位人员列表信息
Map<String, Object> person = new HashMap<>(); personList = listPerson(company.getSequenceNbr() + "").stream().map(p -> {
person.put("tel", getValue(p.get("telephone"), null)); Map<String, Object> person = new HashMap<>();
person.put("img", getValue(p.get("personImg"), null)); person.put("tel", getValue(p.get("telephone"), null));
person.put("id", getValue(p.get("sequenceNbr"), null)); person.put("img", getValue(p.get("personImg"), null));
person.put("name", getValue(p.get("bizOrgName"), null)); person.put("id", getValue(p.get("sequenceNbr"), null));
person.put("zhiwei", getValue(p.get("administrativePositionCode"), null)); person.put("name", getValue(p.get("bizOrgName"), null));
person.put("unit", getValue(p.get("fireManagementPostCode"), null)); person.put("zhiwei", getValue(p.get("administrativePositionCode"), null));
return person; person.put("unit", getValue(p.get("fireManagementPostCode"), null));
}).collect(Collectors.toList()); return person;
resultMap.put("children", personList); }).collect(Collectors.toList());
companyPersonMsg.add(resultMap); resultMap.put("children", personList);
} companyPersonMsg.add(resultMap);
return companyPersonMsg; }
} return companyPersonMsg;
}
private Object getValue(Object obj, Object defaultValue) {
return ObjectUtils.isEmpty(obj) ? defaultValue : obj; private Object getValue(Object obj, Object defaultValue) {
} return ObjectUtils.isEmpty(obj) ? defaultValue : obj;
}
public List<Map<String, Object>> listPerson(String parentId) { public List<Map<String, Object>> listPerson(String parentId) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode())); map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
map.put("bizOrgType", OrgPersonEnum.人员.getKey()); map.put("bizOrgType", OrgPersonEnum.人员.getKey());
map.put("parentId", parentId); map.put("parentId", parentId);
List<Map<String, Object>> list = this.baseMapper.selectPersonAllList(map); List<Map<String, Object>> list = this.baseMapper.selectPersonAllList(map);
return list == null ? new ArrayList<Map<String, Object>>() : list; return list == null ? new ArrayList<Map<String, Object>>() : list;
} }
public IPage<Map<String, Object>> pagePerson(String pageNum, String pageSize, Map<String, Object> req) {
public IPage<Map<String, Object>> pagePerson(String pageNum, String pageSize, Map<String, Object> req) { IPage<Map<String, Object>> pageBean = null;
IPage<Map<String, Object>> pageBean = null; if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) { pageBean = new Page<>(0, Long.MAX_VALUE);
pageBean = new Page<>(0, Long.MAX_VALUE); } else {
} else { pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize)); }
} Map<String, Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>(); map.put("bizOrgType", OrgPersonEnum.人员.getKey());
map.put("bizOrgType", OrgPersonEnum.人员.getKey()); if (!ObjectUtils.isEmpty(req.get("bizOrgName"))) {
if (!ObjectUtils.isEmpty(req.get("bizOrgName"))) { map.put("bizOrgName", req.get("bizOrgName"));
map.put("bizOrgName", req.get("bizOrgName")); }
} OrgUsr parent = this.getById(Long.valueOf(req.get("parentId").toString()));
OrgUsr parent = this.getById(Long.valueOf(req.get("parentId").toString())); map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode()); req.remove("bizOrgName");
req.remove("bizOrgName"); req.remove("pageSize");
req.remove("pageSize"); req.remove("pageNum");
req.remove("pageNum"); req.remove("parentId");
req.remove("parentId"); map.put("fieldsValue", req);
map.put("fieldsValue", req); map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode())); pageBean.setTotal(this.baseMapper.selectPersonListCount(map));
pageBean.setTotal(this.baseMapper.selectPersonListCount(map)); map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize());
map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize()); map.put("pageSize", pageBean.getSize());
map.put("pageSize", pageBean.getSize());
List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
pageBean.setRecords(list);
pageBean.setRecords(list); return pageBean;
return pageBean; }
}
@Override
@Override public List<FormValue> getFormValue(Long id) throws Exception {
public List<FormValue> getFormValue(Long id) throws Exception { // 动态表单数据
// 动态表单数据 List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id); List<FormValue> formValue = new ArrayList<>();
List<FormValue> formValue = new ArrayList<>(); for (DynamicFormInstanceDto alertFormValue : list) {
for (DynamicFormInstanceDto alertFormValue : list) { if (alertFormValue.getFieldValue() != null) {
if (alertFormValue.getFieldValue() != null) { FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
alertFormValue.getFieldType(), formValue.add(value);
alertFormValue.getFieldValue(), alertFormValue.getBlock()); } else {
formValue.add(value); FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
} else { alertFormValue.getFieldType(), alertFormValue.getFieldValueLabel(), alertFormValue.getBlock());
FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), formValue.add(value);
alertFormValue.getFieldType(), }
alertFormValue.getFieldValueLabel(), alertFormValue.getBlock()); }
formValue.add(value); return formValue;
} }
}
return formValue; public List<FormValue> getFormValueDetail(Long id) throws Exception {
} // 动态表单数据
List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
public List<FormValue> getFormValueDetail(Long id) throws Exception { List<FormValue> formValue = new ArrayList<>();
// 动态表单数据 for (DynamicFormInstanceDto alertFormValue : list) {
List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id); FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
List<FormValue> formValue = new ArrayList<>(); alertFormValue.getFieldType(), alertFormValue.getFieldValue(), alertFormValue.getBlock());
for (DynamicFormInstanceDto alertFormValue : list) { formValue.add(value);
FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), }
alertFormValue.getFieldType(), return formValue;
alertFormValue.getFieldValue(), alertFormValue.getBlock()); }
formValue.add(value);
} @Override
return formValue; public void saveOrgUsr(OrgUsr oriOrgUsr, Long id) throws Exception {
} OrgUsr orgUsr = new OrgUsr();
OrgUsr ori = getById(id);
@Override orgUsr.setSequenceNbr(id);
public void saveOrgUsr(OrgUsr oriOrgUsr, Long id) throws Exception { orgUsr.setRecDate(new Date());
OrgUsr orgUsr = new OrgUsr(); orgUsr.setRecUserId(ori.getRecUserId());
OrgUsr ori = getById(id); orgUsr.setRecUserName(ori.getRecUserName());
orgUsr.setSequenceNbr(id); orgUsr.setAmosOrgId(ori.getAmosOrgId());
orgUsr.setRecDate(new Date()); orgUsr.setAmosOrgCode(ori.getAmosOrgCode());
orgUsr.setRecUserId(ori.getRecUserId());
orgUsr.setRecUserName(ori.getRecUserName()); if (oriOrgUsr.getParentId() != null) {
orgUsr.setAmosOrgId(ori.getAmosOrgId()); if (ori.getParentId() != null && !ori.getParentId().equals(oriOrgUsr.getParentId())) {
orgUsr.setAmosOrgCode(ori.getAmosOrgCode()); OrgUsr parent = getById(oriOrgUsr.getParentId());
if (parent != null && ObjectUtils.isEmpty(oriOrgUsr.getBizOrgCode())) {
if (oriOrgUsr.getParentId() != null) { orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
if (ori.getParentId() != null && !ori.getParentId().equals(oriOrgUsr.getParentId())) { }
OrgUsr parent = getById(oriOrgUsr.getParentId()); updateChildOrgCode(ori.getBizOrgCode(), parent.getBizOrgCode());
if (parent != null && ObjectUtils.isEmpty(oriOrgUsr.getBizOrgCode())) { orgUsr.setParentId(oriOrgUsr.getParentId());
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); } else if (ori.getParentId() == null && oriOrgUsr.getParentId() != null) {
} OrgUsr parent = getById(oriOrgUsr.getParentId());
updateChildOrgCode(ori.getBizOrgCode(), parent.getBizOrgCode()); if (parent != null && ObjectUtils.isEmpty(oriOrgUsr.getBizOrgCode())) {
orgUsr.setParentId(oriOrgUsr.getParentId()); orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
} else if (ori.getParentId() == null && oriOrgUsr.getParentId() != null) { }
OrgUsr parent = getById(oriOrgUsr.getParentId()); updateChildOrgCode(ori.getBizOrgCode(), parent.getBizOrgCode());
if (parent != null && ObjectUtils.isEmpty(oriOrgUsr.getBizOrgCode())) { orgUsr.setParentId(oriOrgUsr.getParentId());
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); }
} } else {
updateChildOrgCode(ori.getBizOrgCode(), parent.getBizOrgCode()); orgUsr.setBizOrgCode(getOrgCodeStr());
orgUsr.setParentId(oriOrgUsr.getParentId()); updateChildOrgCode(ori.getBizOrgCode(), orgUsr.getBizOrgCode());
} }
} else { updateById(orgUsr);
orgUsr.setBizOrgCode(getOrgCodeStr()); }
updateChildOrgCode(ori.getBizOrgCode(), orgUsr.getBizOrgCode());
} private void updateChildOrgCode(String oriOrgCode, String targetOrgCode) {
updateById(orgUsr); List<OrgUsr> list = queryOrgUsrList(oriOrgCode);
} if (ObjectUtils.isEmpty(list)) {
return;
}
private void updateChildOrgCode(String oriOrgCode, String targetOrgCode) { list.forEach(action -> {
List<OrgUsr> list = queryOrgUsrList(oriOrgCode); action.setBizOrgCode(action.getBizOrgCode().replace(oriOrgCode, targetOrgCode));
if (ObjectUtils.isEmpty(list)) { updateById(action);
return; });
} }
list.forEach(action -> {
action.setBizOrgCode(action.getBizOrgCode().replace(oriOrgCode, targetOrgCode)); public List<OrgUsr> queryOrgUsrList(String bizOrgCode) {
updateById(action); return this.baseMapper.queryOrgUsrListByBizOrgCode(bizOrgCode);
}); }
}
@Override
public List<OrgUsr> queryOrgUsrList(String bizOrgCode) { public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) {
return this.baseMapper.queryOrgUsrListByBizOrgCode(bizOrgCode); orgUsr.setRecDate(new Date());
} AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
orgUsr.setRecUserName(user.getRealName());
@Override orgUsr.setRecUserId(user.getUserId());
public void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) { // 单位新增情况
orgUsr.setRecDate(new Date()); save(orgUsr);
AgencyUserModel user = Privilege.agencyUserClient.getme().getResult(); // 填充主键
orgUsr.setRecUserName(user.getRealName()); alertFromValuelist.stream().forEach(alertFromValue -> {
orgUsr.setRecUserId(user.getUserId()); if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
// 单位新增情况 alertFromValue.setGroupCode(OrgPersonEnum.公司.getCode());
save(orgUsr); } else if (OrgPersonEnum.部门.getKey().equals(orgUsr.getBizOrgType())) {
// 填充主键 alertFromValue.setGroupCode(OrgPersonEnum.部门.getCode());
alertFromValuelist.stream().forEach(alertFromValue -> { }
if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) { alertFromValue.setInstanceId(orgUsr.getSequenceNbr());
alertFromValue.setGroupCode(OrgPersonEnum.公司.getCode()); });
} else if (OrgPersonEnum.部门.getKey().equals(orgUsr.getBizOrgType())) { // 保存动态表单数据
alertFromValue.setGroupCode(OrgPersonEnum.部门.getCode()); alertFormValueServiceImpl.saveBatch(alertFromValuelist);
} }
alertFromValue.setInstanceId(orgUsr.getSequenceNbr());
}); @Override
// 保存动态表单数据 public void updateDynamicFormInstance(OrgUsr orgUsr, Long alertCalledId, List<DynamicFormInstance> alertFromValuelist) throws Exception {
alertFormValueServiceImpl.saveBatch(alertFromValuelist); // 填充主键
} alertFromValuelist.stream().forEach(alertFromValue -> {
alertFromValue.setInstanceId(orgUsr.getSequenceNbr());
@Override });
public void updateDynamicFormInstance(OrgUsr orgUsr, Long alertCalledId, List<DynamicFormInstance> alertFromValuelist) throws Exception { List<DynamicFormInstanceDto> formList = alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr());
// 填充主键
alertFromValuelist.stream().forEach(alertFromValue -> { Map<Long, DynamicFormInstanceDto> resourceMap = new HashMap<>();
alertFromValue.setInstanceId(orgUsr.getSequenceNbr()); Map<Long, DynamicFormInstance> newResoourceMap = new HashMap<>();
}); formList.parallelStream().forEach(form -> {
List<DynamicFormInstanceDto> formList = alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr()); resourceMap.put(form.getFormColumnId(), form);
if (formList != null && formList.size() > 0) { });
for (DynamicFormInstance dis : alertFromValuelist) {
for (DynamicFormInstanceDto src : formList) { List<DynamicFormInstance> updateList = new ArrayList<>();
if (dis.getFormColumnId() == src.getFormColumnId()) { List<DynamicFormInstance> addList = new ArrayList<>();
dis.setSequenceNbr(src.getSequenceNbr()); List<Long> deleteList = new ArrayList<>();
dis.setRecDate(new Date());
dis.setRecUserId(orgUsr.getRecUserId()); alertFromValuelist.parallelStream().forEach(submitFormItem -> {
dis.setRecUserName(orgUsr.getRecUserName()); if ( resourceMap.containsKey(submitFormItem.getFormColumnId())) {
dis.setFieldValue(src.getFieldValue()); DynamicFormInstanceDto oldForm = resourceMap.get(submitFormItem.getFormColumnId());
dis.setFieldValueLabel(src.getFieldValueLabel()); submitFormItem.setSequenceNbr(oldForm.getSequenceNbr());
dis.setSequenceNbr(src.getSequenceNbr()); updateList.add(submitFormItem);
break; }else {
} addList.add(submitFormItem);
} }
} newResoourceMap.put(submitFormItem.getFormColumnId(), submitFormItem);
// 保存动态表单数据 });
alertFormValueServiceImpl.updateBatchById(alertFromValuelist);
List<DynamicFormColumnDto> form = alertFormServiceImpl.queryListByTypeCode(formList.get(0).getGroupCode()); newResoourceMap.keySet().parallelStream().forEach(form -> {
resourceMap.remove(form);
if (form.size() != alertFromValuelist.size()) { });
List<DynamicFormInstance> creatList = new ArrayList<>(); resourceMap.keySet().parallelStream().forEach(action -> {
deleteList.add(resourceMap.get(action).getSequenceNbr());
for (DynamicFormInstance dis : alertFromValuelist) { });
boolean exist = false;
for (DynamicFormInstanceDto src : formList) { if (deleteList.size() > 0) {
if (dis.getFormColumnId() == src.getSequenceNbr()) { alertFormValueServiceImpl.deleteBatchSeq(deleteList);
exist = true; }
break;
} if (updateList.size() > 0) {
} alertFormValueServiceImpl.updateBatchById(updateList);
if (ObjectUtils.isEmpty(dis) && !exist) { }
creatList.add(dis);
} if (addList.size() > 0) {
} alertFormValueServiceImpl.saveBatch(addList);
}
alertFormValueServiceImpl.saveBatch(creatList); }
}
@Override
List<DynamicFormInstance> creatList = public Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception {
alertFromValuelist.stream().filter(v -> v.getSequenceNbr() == null || v.getSequenceNbr() == 0).collect(Collectors.toList()); QueryWrapper<DynamicFormColumn> queryWrapper = new QueryWrapper<DynamicFormColumn>();
if (creatList != null && creatList.size() > 0) { queryWrapper.eq("group_code", OrgPersonEnum.人员.getCode());
alertFormValueServiceImpl.saveBatch(creatList); List<DynamicFormColumn> alertForms = alertFormServiceImpl.list(queryWrapper);
} // 动态表单数据
} else { List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
// 保存动态表单数据 Map<String, Object> result = new HashMap<>();
alertFormValueServiceImpl.saveBatch(alertFromValuelist); result = Bean.BeantoMap(orgUsr);
} result.put("parenName", getById(orgUsr.getParentId()).getBizOrgName());
} // 放入所有动态表单数据
for (DynamicFormColumn alertForm : alertForms) {
@Override result.put(alertForm.getFieldCode(), null);
public Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception { }
QueryWrapper<DynamicFormColumn> queryWrapper = new QueryWrapper<DynamicFormColumn>(); for (DynamicFormInstanceDto alertFormValue : list) {
queryWrapper.eq("group_code", OrgPersonEnum.人员.getCode()); result.put(alertFormValue.getFieldCode(),
List<DynamicFormColumn> alertForms = alertFormServiceImpl.list(queryWrapper); ObjectUtils.isEmpty(alertFormValue.getFieldValueLabel()) ? alertFormValue.getFieldValue()
// 动态表单数据 : alertFormValue.getFieldValueLabel());
List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id); }
Map<String, Object> result = new HashMap<>(); return result;
result = Bean.BeantoMap(orgUsr); }
result.put("parenName", getById(orgUsr.getParentId()).getBizOrgName());
// 放入所有动态表单数据 @Override
for (DynamicFormColumn alertForm : alertForms) { public List<OrgUsr> selectCompanyDepartmentMsg() {
result.put(alertForm.getFieldCode(), null); List<OrgUsr> list = this.baseMapper.selectCompanyDepartmentMsg();
} if (list == null) {
for (DynamicFormInstanceDto alertFormValue : list) { return new ArrayList<>();
result.put(alertFormValue.getFieldCode(), ObjectUtils.isEmpty(alertFormValue.getFieldValueLabel()) ? alertFormValue.getFieldValue() : alertFormValue.getFieldValueLabel()); }
} list = list.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
return result; return list;
} }
@Override @Override
public List<OrgUsr> selectCompanyDepartmentMsg() { public void saveOrgUsr(OrgUsrDto OrgUsrVo) throws Exception {
List<OrgUsr> list = this.baseMapper.selectCompanyDepartmentMsg(); OrgUsr orgUsr = new OrgUsr();
if (list == null) { BeanUtils.copyProperties(OrgUsrVo, orgUsr);
return new ArrayList<>(); orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
} if (OrgUsrVo.getParentId() != null) {
list = list.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList()); OrgUsr parent = getById(OrgUsrVo.getParentId());
return list; if (parent != null && ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
} orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
}
@Override } else {
public void saveOrgUsr(OrgUsrDto OrgUsrVo) throws Exception { orgUsr.setBizOrgCode(getOrgCodeStr());
OrgUsr orgUsr = new OrgUsr(); }
BeanUtils.copyProperties(OrgUsrVo, orgUsr); saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY); }
if (OrgUsrVo.getParentId() != null) {
OrgUsr parent = getById(OrgUsrVo.getParentId()); @Override
if (parent != null && ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) { public void saveOrgPerson(OrgPersonDto OrgPersonVo) throws Exception {
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); OrgUsr orgUsr = new OrgUsr();
} BeanUtils.copyProperties(OrgPersonVo, orgUsr);
} else { orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
orgUsr.setBizOrgCode(getOrgCodeStr()); if (OrgPersonVo.getParentId() != null) {
} OrgUsr parent = getById(OrgPersonVo.getParentId());
saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue()); if (parent != null && ObjectUtils.isEmpty(OrgPersonVo.getBizOrgCode())) {
} orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
}
@Override } else {
public void saveOrgPerson(OrgPersonDto OrgPersonVo) throws Exception { orgUsr.setBizOrgCode(getOrgCodeStr());
OrgUsr orgUsr = new OrgUsr(); }
BeanUtils.copyProperties(OrgPersonVo, orgUsr);
orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON); if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
if (OrgPersonVo.getParentId() != null) { AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
OrgUsr parent = getById(OrgPersonVo.getParentId()); OrgPersonVo.setAmosOrgCode(user.getRealName());
if (parent != null && ObjectUtils.isEmpty(OrgPersonVo.getBizOrgCode())) { }
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
} saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
} else { }
orgUsr.setBizOrgCode(getOrgCodeStr());
} @Override
public void updateByIdOrgUsr(OrgUsrDto OrgUsrVo, Long id) throws Exception {
// 修改单位信息
if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) { OrgUsr orgUsr = new OrgUsr();
AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult(); OrgUsr oriOrgUsr = getById(id);
OrgPersonVo.setAmosOrgCode(user.getRealName()); BeanUtils.copyProperties(OrgUsrVo, orgUsr);
} if (orgUsr.getParentId() != null) {
OrgUsr parent = getById(orgUsr.getParentId());
saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue()); if (parent != null && ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
} orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
}
@Override } else {
public void updateByIdOrgUsr(OrgUsrDto OrgUsrVo, Long id) throws Exception { orgUsr.setBizOrgCode(getOrgCodeStr());
// 修改单位信息 }
OrgUsr orgUsr = new OrgUsr(); saveOrgUsr(orgUsr, id);
OrgUsr oriOrgUsr = getById(id); // 保存动态表单数据
BeanUtils.copyProperties(OrgUsrVo, orgUsr); updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgUsrVo.getDynamicFormValue());
if (orgUsr.getParentId() != null) { }
OrgUsr parent = getById(orgUsr.getParentId());
if (parent != null && ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) { @Override
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); public void updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception {
} // 修改人员信息
} else { OrgUsr orgUsr = new OrgUsr();
orgUsr.setBizOrgCode(getOrgCodeStr()); OrgUsr oriOrgUsr = getById(id);
} BeanUtils.copyProperties(OrgPersonVo, orgUsr);
saveOrgUsr(orgUsr, id); if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
// 保存动态表单数据 AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgUsrVo.getDynamicFormValue()); oriOrgUsr.setAmosOrgCode(user.getRealName());
} oriOrgUsr.setAmosOrgId(user.getUserId());
orgUsr.setAmosOrgCode(user.getRealName());
@Override orgUsr.setAmosOrgId(user.getUserId());
public void updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception { }
// 修改人员信息
OrgUsr orgUsr = new OrgUsr(); saveOrgUsr(oriOrgUsr, id);
OrgUsr oriOrgUsr = getById(id); // 保存动态表单数据
BeanUtils.copyProperties(OrgPersonVo, orgUsr); updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue());
if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) { }
AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
oriOrgUsr.setAmosOrgCode(user.getRealName()); @Override
oriOrgUsr.setAmosOrgId(user.getUserId()); public OrgUsrFormDto selectCompanyById(Long id) throws Exception {
orgUsr.setAmosOrgCode(user.getRealName()); OrgUsr orgUsr = getById(id);
orgUsr.setAmosOrgId(user.getUserId()); // 动态表单数据
} List<FormValue> formValue = getFormValue(id);
OrgUsrFormDto orgUsrFormVo = new OrgUsrFormDto();
saveOrgUsr(oriOrgUsr, id); orgUsrFormVo.setDynamicFormAlert(formValue);
// 保存动态表单数据 BeanUtils.copyProperties(orgUsr, orgUsrFormVo);
updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue()); return orgUsrFormVo;
} }
@Override @Override
public OrgUsrFormDto selectCompanyById(Long id) throws Exception { public IPage<OrgUsr> bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception {
OrgUsr orgUsr = getById(id);
// 动态表单数据 Map<String, Object> columnMap = new HashMap<>();
List<FormValue> formValue = getFormValue(id); columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
OrgUsrFormDto orgUsrFormVo = new OrgUsrFormDto(); columnMap.put("biz_org_type", bizOrgType);
orgUsrFormVo.setDynamicFormAlert(formValue); Page<OrgUsr> pageBean = new Page<OrgUsr>();
BeanUtils.copyProperties(orgUsr, orgUsrFormVo); if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
return orgUsrFormVo; pageBean = new Page<>(0, Long.MAX_VALUE);
} } else {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
@Override }
public IPage<OrgUsr> bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception { QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<OrgUsr>();
queryWrapper.allEq(columnMap);
Map<String, Object> columnMap = new HashMap<>(); queryWrapper.orderByAsc("sequence_nbr");
columnMap.put("is_delete", CommonConstant.IS_DELETE_00); return page(pageBean, queryWrapper);
columnMap.put("biz_org_type", bizOrgType); }
Page<OrgUsr> pageBean = new Page<OrgUsr>();
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) { @Override
pageBean = new Page<>(0, Long.MAX_VALUE); public void saveDepartment(List<OrgDepartmentDto> OrgDepartmentVo, Long id) throws Exception {
} else { for (int i = 0; i < OrgDepartmentVo.size(); i++) {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize)); // 导入部门信息的前提条件：单位信息已经存在
} if (getById(id) != null) {
QueryWrapper<OrgUsr> queryWrapper = new QueryWrapper<OrgUsr>(); OrgUsr orgUsr = new OrgUsr();
queryWrapper.allEq(columnMap); BeanUtils.copyProperties(OrgDepartmentVo.get(i), orgUsr);
queryWrapper.orderByAsc("sequence_nbr"); orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
return page(pageBean, queryWrapper); saveOrgUsrDynamicFormInstance(orgUsr, OrgDepartmentVo.get(i).getDynamicFormValue());
} }
}
@Override }
public void saveDepartment(List<OrgDepartmentDto> OrgDepartmentVo, Long id) throws Exception {
for (int i = 0; i < OrgDepartmentVo.size(); i++) { @Override
// 导入部门信息的前提条件：单位信息已经存在 public void saveCompany(List<OrgUsrDto> OrgUsrVo) throws Exception {
if (getById(id) != null) { for (int i = 0; i < OrgUsrVo.size(); i++) {
OrgUsr orgUsr = new OrgUsr(); OrgUsr orgUsr = new OrgUsr();
BeanUtils.copyProperties(OrgDepartmentVo.get(i), orgUsr); BeanUtils.copyProperties(OrgUsrVo.get(i), orgUsr);
orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT); orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
saveOrgUsrDynamicFormInstance(orgUsr, OrgDepartmentVo.get(i).getDynamicFormValue()); saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.get(i).getDynamicFormValue());
} }
} }
}
@Override
@Override public OrgPersonFormDto selectPersonById(Long id) throws Exception {
public void saveCompany(List<OrgUsrDto> OrgUsrVo) throws Exception { OrgUsr orgUsr = getById(id);
for (int i = 0; i < OrgUsrVo.size(); i++) { // 动态表单数据
OrgUsr orgUsr = new OrgUsr(); List<FormValue> formValue = getFormValue(id);
BeanUtils.copyProperties(OrgUsrVo.get(i), orgUsr); OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue);
orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY); BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.get(i).getDynamicFormValue()); OrgUsr parent = getById(orgUsr.getParentId());
} if (!ObjectUtils.isEmpty(parent)) {
} orgPersonFormVo.setParentName(parent.getBizOrgName());
}
@Override
public OrgPersonFormDto selectPersonById(Long id) throws Exception { return orgPersonFormVo;
OrgUsr orgUsr = getById(id); }
// 动态表单数据
List<FormValue> formValue = getFormValue(id); @Override
OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue); public OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception {
BeanUtils.copyProperties(orgUsr, orgPersonFormVo); OrgUsr orgUsr = getById(id);
OrgUsr parent = getById(orgUsr.getParentId()); // 动态表单数据
if (!ObjectUtils.isEmpty(parent)) { List<FormValue> formValue = getFormValueDetail(id);
orgPersonFormVo.setParentName(parent.getBizOrgName()); OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue);
} BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
orgPersonFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
return orgPersonFormVo; return orgPersonFormVo;
} }
@Override @Override
public OrgPersonFormDto selectPersonByIdDetail(Long id) throws Exception { public List<OrgMenuDto> selectPersonTree() throws Exception {
OrgUsr orgUsr = getById(id); Map<String, Object> columnMap = new HashMap<>();
// 动态表单数据 columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
List<FormValue> formValue = getFormValueDetail(id); columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
OrgPersonFormDto orgPersonFormVo = new OrgPersonFormDto(formValue); Collection<OrgUsr> list = listByMap(columnMap);
BeanUtils.copyProperties(orgUsr, orgPersonFormVo); return getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId",
orgPersonFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName()); "getBizOrgType");
return orgPersonFormVo; }
}
@Override
public void savePersonList(List<OrgPersonDto> OrgPersonVo) throws Exception {
@Override for (int i = 0; i < OrgPersonVo.size(); i++) {
public List<OrgMenuDto> selectPersonTree() throws Exception { OrgUsr orgUsr = new OrgUsr();
Map<String, Object> columnMap = new HashMap<>(); BeanUtils.copyProperties(OrgPersonVo.get(i), orgUsr);
columnMap.put("is_delete", CommonConstant.IS_DELETE_00); orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON); saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.get(i).getDynamicFormValue());
Collection<OrgUsr> list = listByMap(columnMap); }
return getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", }
"getBizOrgType");
} @Override
public void saveOrgDepartment(OrgDepartmentDto OrgDepartmentVo) throws Exception {
OrgUsr orgUsr = new OrgUsr();
@Override BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
public void savePersonList(List<OrgPersonDto> OrgPersonVo) throws Exception { orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
for (int i = 0; i < OrgPersonVo.size(); i++) { if (OrgDepartmentVo.getParentId() != null) {
OrgUsr orgUsr = new OrgUsr(); OrgUsr parent = getById(OrgDepartmentVo.getParentId());
BeanUtils.copyProperties(OrgPersonVo.get(i), orgUsr); if (parent != null && ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) {
orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON); orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.get(i).getDynamicFormValue()); }
} } else {
} orgUsr.setBizOrgCode(getOrgCodeStr());
}
@Override saveOrgUsrDynamicFormInstance(orgUsr, OrgDepartmentVo.getDynamicFormValue());
public void saveOrgDepartment(OrgDepartmentDto OrgDepartmentVo) throws Exception { }
OrgUsr orgUsr = new OrgUsr();
BeanUtils.copyProperties(OrgDepartmentVo, orgUsr); @Override
orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT); public void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentVo, Long id) throws Exception {
if (OrgDepartmentVo.getParentId() != null) { // 修改部门信息
OrgUsr parent = getById(OrgDepartmentVo.getParentId()); OrgUsr orgUsr = new OrgUsr();
if (parent != null && ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) { OrgUsr oriOrgUsr = getById(id);
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
} if (orgUsr.getParentId() != null) {
} else { OrgUsr parent = getById(orgUsr.getParentId());
orgUsr.setBizOrgCode(getOrgCodeStr()); if (parent != null && ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) {
} orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
saveOrgUsrDynamicFormInstance(orgUsr, OrgDepartmentVo.getDynamicFormValue()); }
} } else {
orgUsr.setBizOrgCode(getOrgCodeStr());
@Override }
public void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentVo, Long id) throws Exception { saveOrgUsr(orgUsr, id);
// 修改部门信息 // 保存动态表单数据
OrgUsr orgUsr = new OrgUsr(); updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue());
OrgUsr oriOrgUsr = getById(id); }
BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
if (orgUsr.getParentId() != null) { @Override
OrgUsr parent = getById(orgUsr.getParentId()); public OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception {
if (parent != null && ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) { OrgUsr orgUsr = getById(id);
orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); // 动态表单数据
} List<FormValue> formValue = getFormValue(id);
} else { OrgDepartmentFormDto orgDepartmentFormVo = new OrgDepartmentFormDto(formValue);
orgUsr.setBizOrgCode(getOrgCodeStr()); BeanUtils.copyProperties(orgUsr, orgDepartmentFormVo);
} return orgDepartmentFormVo;
saveOrgUsr(orgUsr, id); }
// 保存动态表单数据
updateDynamicFormInstance(oriOrgUsr, orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue()); @Override
} public List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception {
List<Map<String, Object>> personResult = new ArrayList<>();
@Override for (int i = 0; i < ids.size(); i++) {
public OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception { OrgUsr orgUsr = getById(ids.get(i));
OrgUsr orgUsr = getById(id); Map<String, Object> result = selectForShowById(orgUsr, ids.get(i));
// 动态表单数据 personResult.add(result);
List<FormValue> formValue = getFormValue(id); }
OrgDepartmentFormDto orgDepartmentFormVo = new OrgDepartmentFormDto(formValue); return personResult;
BeanUtils.copyProperties(orgUsr, orgDepartmentFormVo); }
return orgDepartmentFormVo;
} public static String getOrgCodeStr() {
int length = 6;
@Override String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
public List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception { Random random = new Random();
List<Map<String, Object>> personResult = new ArrayList<>(); StringBuffer sb = new StringBuffer();
for (int i = 0; i < ids.size(); i++) { for (int i = 0; i < length; i++) {
OrgUsr orgUsr = getById(ids.get(i)); int number = random.nextInt(62);
Map<String, Object> result = selectForShowById(orgUsr, ids.get(i)); sb.append(str.charAt(number));
personResult.add(result); }
} return sb.toString();
return personResult; }
}
public void importByExcel(List<OrgPersonExcelDto> list) {
public static String getOrgCodeStr() { list.forEach(item -> {
int length = 6; OrgPersonDto orgPersonDto = new OrgPersonDto();
String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; orgPersonDto = Bean.toPo(item, orgPersonDto);
Random random = new Random(); List<DynamicFormInstance> alertFormValueList = new ArrayList<>();
StringBuffer sb = new StringBuffer(); if (item.getPersonNumber() != null) {
for (int i = 0; i < length; i++) { DynamicFormInstance alertFormValue = new DynamicFormInstance(102L, OrgPersonEnum.人员.getCode(), "员工编号",
int number = random.nextInt(62); "personNumber", item.getPersonNumber(), null, false);
sb.append(str.charAt(number)); alertFormValueList.add(alertFormValue);
} }
return sb.toString(); if (item.getCertificatesType() != null) {
} String certificatesType = item.getCertificatesType();
String[] split = certificatesType.split("@");
public void importByExcel(List<OrgPersonExcelDto> list) { DynamicFormInstance alertFormValue = new DynamicFormInstance(23L, OrgPersonEnum.人员.getCode(), "证件类型",
list.forEach(item -> { "certificatesTypeCode", split[0], split[1], false);
OrgPersonDto orgPersonDto = new OrgPersonDto(); alertFormValueList.add(alertFormValue);
orgPersonDto = Bean.toPo(item, orgPersonDto); }
List<DynamicFormInstance> alertFormValueList = new ArrayList<>(); if (item.getGender() != null) {
if (item.getPersonNumber() != null) { String gender = item.getGender();
DynamicFormInstance alertFormValue = new DynamicFormInstance(102L, OrgPersonEnum.人员.getCode(), "员工编号", "personNumber", String[] split = gender.split("@");
item.getPersonNumber(), null, false); DynamicFormInstance alertFormValue = new DynamicFormInstance(22L, OrgPersonEnum.人员.getCode(), "性别",
alertFormValueList.add(alertFormValue); "gender", split[0], split[1], false);
} alertFormValueList.add(alertFormValue);
if (item.getCertificatesType() != null) { }
String certificatesType = item.getCertificatesType(); if (item.getCertificatesNumber() != null) {
String[] split = certificatesType.split("@"); DynamicFormInstance alertFormValue = new DynamicFormInstance(100L, OrgPersonEnum.人员.getCode(), "证件号码",
DynamicFormInstance alertFormValue = new DynamicFormInstance(23L, OrgPersonEnum.人员.getCode(), "证件类型", "certificatesTypeCode" "certificatesNumber", item.getCertificatesNumber(), null, false);
, split[0], split[1], false); alertFormValueList.add(alertFormValue);
alertFormValueList.add(alertFormValue); }
} if (item.getTelephone() != null) {
if (item.getGender() != null) { DynamicFormInstance alertFormValue = new DynamicFormInstance(24L, OrgPersonEnum.人员.getCode(), "联系电话",
String gender = item.getGender(); "telephone", item.getTelephone(), null, false);
String[] split = gender.split("@"); alertFormValueList.add(alertFormValue);
DynamicFormInstance alertFormValue = new DynamicFormInstance(22L, OrgPersonEnum.人员.getCode(), "性别", "gender", split[0], }
split[1], false); if (item.getState() != null) {
alertFormValueList.add(alertFormValue); String state = item.getState();
} String[] split = state.split("@");
if (item.getCertificatesNumber() != null) { DynamicFormInstance alertFormValue = new DynamicFormInstance(25L, OrgPersonEnum.人员.getCode(), "人员状态",
DynamicFormInstance alertFormValue = new DynamicFormInstance(100L, OrgPersonEnum.人员.getCode(), "证件号码", "certificatesNumber", "stateCode", split[0], split[1], false);
item.getCertificatesNumber(), null, false); alertFormValueList.add(alertFormValue);
alertFormValueList.add(alertFormValue); }
} if (item.getSafetyTraining() != null) {
if (item.getTelephone() != null) { String safetyTraining = item.getSafetyTraining();
DynamicFormInstance alertFormValue = new DynamicFormInstance(24L, OrgPersonEnum.人员.getCode(), "联系电话", "telephone", String[] split = safetyTraining.split("@");
item.getTelephone(), null, false); DynamicFormInstance alertFormValue = new DynamicFormInstance(29L, OrgPersonEnum.人员.getCode(),
alertFormValueList.add(alertFormValue); "是否进行安全培训", "safetyTraining", split[0], split[1], false);
} alertFormValueList.add(alertFormValue);
if (item.getState() != null) { }
String state = item.getState(); if (item.getAdministrativePosition() != null) {
String[] split = state.split("@"); String administrativePosition = item.getAdministrativePosition();
DynamicFormInstance alertFormValue = new DynamicFormInstance(25L, OrgPersonEnum.人员.getCode(), "人员状态", "stateCode", split[0], String[] split = administrativePosition.split("@");
split[1], false); DynamicFormInstance alertFormValue = new DynamicFormInstance(28L, OrgPersonEnum.人员.getCode(), "行政职务",
alertFormValueList.add(alertFormValue); "administrativePositionCode", split[0], split[1], false);
} alertFormValueList.add(alertFormValue);
if (item.getSafetyTraining() != null) { }
String safetyTraining = item.getSafetyTraining(); if (item.getInternalPosition() != null) {
String[] split = safetyTraining.split("@"); String internalPosition = item.getInternalPosition();
DynamicFormInstance alertFormValue = new DynamicFormInstance(29L, OrgPersonEnum.人员.getCode(), "是否进行安全培训", "safetyTraining", String[] split = internalPosition.split("@");
split[0], split[1], false); DynamicFormInstance alertFormValue = new DynamicFormInstance(26L, OrgPersonEnum.人员.getCode(),
alertFormValueList.add(alertFormValue); "消防管理组织机构内部职务", "internalPositionCode", split[0], split[1], false);
} alertFormValueList.add(alertFormValue);
if (item.getAdministrativePosition() != null) { }
String administrativePosition = item.getAdministrativePosition(); if (item.getFireManagementPost() != null) {
String[] split = administrativePosition.split("@"); String fireManagementPost = item.getFireManagementPost();
DynamicFormInstance alertFormValue = new DynamicFormInstance(28L, OrgPersonEnum.人员.getCode(), "行政职务", String[] split = fireManagementPost.split("@");
"administrativePositionCode", split[0], split[1], false); DynamicFormInstance alertFormValue = new DynamicFormInstance(27L, OrgPersonEnum.人员.getCode(), "消防管理岗位",
alertFormValueList.add(alertFormValue); "fireManagementPostCode", split[0], split[1], false);
} alertFormValueList.add(alertFormValue);
if (item.getInternalPosition() != null) { }
String internalPosition = item.getInternalPosition(); if (item.getPositionType() != null) {
String[] split = internalPosition.split("@"); String positionType = item.getPositionType();
DynamicFormInstance alertFormValue = new DynamicFormInstance(26L, OrgPersonEnum.人员.getCode(), "消防管理组织机构内部职务", String[] split = positionType.split("@");
"internalPositionCode", split[0], split[1], false); DynamicFormInstance alertFormValue = new DynamicFormInstance(30L, OrgPersonEnum.人员.getCode(), "岗位类型",
alertFormValueList.add(alertFormValue); "positionType", split[0], split[1], false);
} alertFormValueList.add(alertFormValue);
if (item.getFireManagementPost() != null) { }
String fireManagementPost = item.getFireManagementPost(); if (item.getCertificateType() != null) {
String[] split = fireManagementPost.split("@"); String certificateType = item.getCertificateType();
DynamicFormInstance alertFormValue = new DynamicFormInstance(27L, OrgPersonEnum.人员.getCode(), "消防管理岗位", String[] split = certificateType.split("@");
"fireManagementPostCode", split[0], split[1], false); DynamicFormInstance alertFormValue = new DynamicFormInstance(31L, OrgPersonEnum.人员.getCode(), "持证类别",
alertFormValueList.add(alertFormValue); "certificateType", split[0], split[1], false);
} alertFormValueList.add(alertFormValue);
if (item.getPositionType() != null) { }
String positionType = item.getPositionType(); if (item.getHoldingTime() != null) {
String[] split = positionType.split("@"); DynamicFormInstance alertFormValue = new DynamicFormInstance(32L, OrgPersonEnum.人员.getCode(), "持证时间",
DynamicFormInstance alertFormValue = new DynamicFormInstance(30L, OrgPersonEnum.人员.getCode(), "岗位类型", "positionType", "holdingTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(item.getHoldingTime()), null,
split[0], split[1], false); false);
alertFormValueList.add(alertFormValue); alertFormValueList.add(alertFormValue);
} }
if (item.getCertificateType() != null) { if (item.getAuditCycle() != null) {
String certificateType = item.getCertificateType(); String auditCycle = item.getAuditCycle();
String[] split = certificateType.split("@"); String[] split = auditCycle.split("@");
DynamicFormInstance alertFormValue = new DynamicFormInstance(31L, OrgPersonEnum.人员.getCode(), "持证类别", "certificateType", DynamicFormInstance alertFormValue = new DynamicFormInstance(33L, OrgPersonEnum.人员.getCode(), "审核周期",
split[0], split[1], false); "auditCycle", split[0], split[1], false);
alertFormValueList.add(alertFormValue); alertFormValueList.add(alertFormValue);
} }
if (item.getHoldingTime() != null) { if (item.getPersonImg() != null) {
DynamicFormInstance alertFormValue = new DynamicFormInstance(32L, OrgPersonEnum.人员.getCode(), "持证时间", "holdingTime", DynamicFormInstance alertFormValue = new DynamicFormInstance(34L, OrgPersonEnum.人员.getCode(), "人员照片",
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(item.getHoldingTime()), null, false); "personImg", item.getPersonImg(), null, false);
alertFormValueList.add(alertFormValue); alertFormValueList.add(alertFormValue);
} }
if (item.getAuditCycle() != null) { if (item.getCertificateImg() != null) {
String auditCycle = item.getAuditCycle(); DynamicFormInstance alertFormValue = new DynamicFormInstance(101L, OrgPersonEnum.人员.getCode(),
String[] split = auditCycle.split("@"); "重点工种资质证书", "certificateImg", item.getCertificateImg(), null, false);
DynamicFormInstance alertFormValue = new DynamicFormInstance(33L, OrgPersonEnum.人员.getCode(), "审核周期", "auditCycle", alertFormValueList.add(alertFormValue);
split[0], split[1], false); }
alertFormValueList.add(alertFormValue); try {
} orgPersonDto.setDynamicFormValue(alertFormValueList);
if (item.getPersonImg() != null) { this.saveOrgPerson(orgPersonDto);
DynamicFormInstance alertFormValue = new DynamicFormInstance(34L, OrgPersonEnum.人员.getCode(), "人员照片", "personImg", } catch (Exception e) {
item.getPersonImg(), null, false); e.printStackTrace();
alertFormValueList.add(alertFormValue); }
} });
if (item.getCertificateImg() != null) { }
DynamicFormInstance alertFormValue = new DynamicFormInstance(101L, OrgPersonEnum.人员.getCode(), "重点工种资质证书", "certificateImg",
item.getCertificateImg(), null, false); public List<OrgPersonExcelDto> queryOrgPersonDtoList(boolean isDelete) {
alertFormValueList.add(alertFormValue);
} List<OrgPersonExcelDto> excelOrgPersonDtoList = orgUsrMapper.queryOrgPersonDtoList(isDelete);
try {
orgPersonDto.setDynamicFormValue(alertFormValueList); return excelOrgPersonDtoList;
this.saveOrgPerson(orgPersonDto); }
} catch (Exception e) {
e.printStackTrace();
}
}
);
}
public List<OrgPersonExcelDto> queryOrgPersonDtoList(boolean isDelete) {
List<OrgPersonExcelDto> excelOrgPersonDtoList = orgUsrMapper.queryOrgPersonDtoList(isDelete);
return excelOrgPersonDtoList;
}
} }
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