|
|
|
@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.service.enterpriseinspections;
|
|
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.system.controller.admin.auth.vo.RoleNameAndSelectTypeVO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; |
|
|
|
@ -23,6 +24,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.tasktag.TaskTagMapper;
|
|
|
|
|
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.auth.AdminAuthService; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.dept.DeptService; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.dict.DictDataService; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.inspectionslog.InspectionsLogService; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.taglibrary.TagLibraryService; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
|
|
|
@ -85,6 +87,8 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
|
|
|
|
|
private SignInLogMapper signInLogMapper; |
|
|
|
|
@Resource |
|
|
|
|
private AdminAuthService authService; |
|
|
|
|
@Resource |
|
|
|
|
private DictDataService dictDataService; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public Long createEnterpriseInspections(EnterpriseInspectionsSaveReqVO createReqVO) { |
|
|
|
@ -245,12 +249,23 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//查询企业标签
|
|
|
|
|
final TagLibraryDO tagLibrary = tagLibraryService.getTagLibrary(taskInfoDO.getTaskType()); |
|
|
|
|
if (tagLibrary != null) { |
|
|
|
|
List<String> list = new ArrayList<>(); |
|
|
|
|
list.add(tagLibrary.getTagName()); |
|
|
|
|
item.setTagList(list); |
|
|
|
|
final List<TagLibraryDO> tagLibraryDOS = tagLibraryService.listByEnterpriseId(enterpriseDO.getId()); |
|
|
|
|
//添加地址
|
|
|
|
|
final DictDataDO enterprisesArea = dictDataService.getDictData("enterprises_area", enterpriseDO.getRegion()); |
|
|
|
|
|
|
|
|
|
if (tagLibraryDOS != null && tagLibraryDOS.size() > 0) { |
|
|
|
|
final List<String> collect = tagLibraryDOS.stream().map(tagLibraryDO -> tagLibraryDO.getTagName()).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
if (enterprisesArea != null) { |
|
|
|
|
collect.add(0, enterprisesArea.getLabel()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
item.setTagList(collect); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
item.setEnterpriseName(enterpriseDO.getEnterprisesName()); |
|
|
|
|
item.setEnterpriseAddress(enterpriseDO.getAddress()); |
|
|
|
|
|
|
|
|
|