|
|
|
|
@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.taglibrary.TagLibraryDO;
|
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.tasktag.TaskTagDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.mysql.enterprise.EnterpriseMapper; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.mysql.inspectionslog.InspectionsLogMapper; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.mysql.taglibrary.TagLibraryMapper; |
|
|
|
|
@ -22,6 +23,8 @@ import org.springframework.validation.annotation.Validated;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.*; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO; |
|
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult; |
|
|
|
|
@ -33,6 +36,8 @@ import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.Enterprise
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
|
|
|
|
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; |
|
|
|
|
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
|
|
|
|
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
@ -89,7 +94,15 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
|
|
|
|
|
// 删除
|
|
|
|
|
enterpriseInspectionsMapper.deleteById(id); |
|
|
|
|
} |
|
|
|
|
@Override |
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
|
public int deleteEnterpriseInspectionsTaskId(Long taskId) { |
|
|
|
|
LambdaQueryWrapper<EnterpriseInspectionsDO> taskMembersDOLambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
taskMembersDOLambdaQueryWrapper.eq(EnterpriseInspectionsDO::getTaskId, taskId); |
|
|
|
|
// 删除
|
|
|
|
|
return enterpriseInspectionsMapper.delete(taskMembersDOLambdaQueryWrapper); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
private void validateEnterpriseInspectionsExists(Long id) { |
|
|
|
|
if (enterpriseInspectionsMapper.selectById(id) == null) { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); |
|
|
|
|
@ -98,12 +111,63 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public EnterpriseInspectionsDO getEnterpriseInspections(Long id) { |
|
|
|
|
return enterpriseInspectionsMapper.selectById(id); |
|
|
|
|
|
|
|
|
|
final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(id); |
|
|
|
|
if (enterpriseInspectionsDO == null) { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
final TaskInfoDO taskInfoDO = taskInfoMapper.selectById(enterpriseInspectionsDO.getTaskId()); |
|
|
|
|
if (taskInfoDO == null) { |
|
|
|
|
throw exception(TASK_INFO_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
enterpriseInspectionsDO.setTaskName(taskInfoDO.getTitle()); |
|
|
|
|
enterpriseInspectionsDO.setTaskName(taskInfoDO.getTitle()); |
|
|
|
|
enterpriseInspectionsDO.setTaskNumber(taskInfoDO.getTaskNumber()); |
|
|
|
|
|
|
|
|
|
final EnterpriseDO enterpriseDO = enterpriseMapper.selectById(enterpriseInspectionsDO.getEnterpriseId()); |
|
|
|
|
if (enterpriseDO == null) { |
|
|
|
|
throw exception(ENTERPRISE_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
//任务类型
|
|
|
|
|
enterpriseInspectionsDO.setEnterpriseName(enterpriseDO.getEnterprisesName()); |
|
|
|
|
|
|
|
|
|
final AdminUserDO user = adminUserService.getUser(enterpriseInspectionsDO.getUserId()); |
|
|
|
|
if (user == null) { |
|
|
|
|
throw exception(USER_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
enterpriseInspectionsDO.setInspectName(user.getRealName()); |
|
|
|
|
|
|
|
|
|
final DeptDO dept = deptService.getDept(user.getDeptId()); |
|
|
|
|
|
|
|
|
|
enterpriseInspectionsDO.setDepartment(dept.getName()); |
|
|
|
|
|
|
|
|
|
return enterpriseInspectionsDO; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public PageResult<EnterpriseInspectionsDO> getEnterpriseInspectionsPage(EnterpriseInspectionsPageReqVO pageReqVO) { |
|
|
|
|
|
|
|
|
|
if (pageReqVO.getEnterpriseName() != null) { |
|
|
|
|
LambdaQueryWrapper<EnterpriseDO> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper.like(EnterpriseDO::getEnterprisesName, pageReqVO.getEnterpriseName()); |
|
|
|
|
final List<EnterpriseDO> enterpriseDOS = enterpriseMapper.selectList(wrapper); |
|
|
|
|
if (enterpriseDOS != null || enterpriseDOS.size() > 0) { |
|
|
|
|
final List<Long> collect = enterpriseDOS.stream().map(item -> item.getId()).collect(Collectors.toList()); |
|
|
|
|
pageReqVO.setEnterpriseList(collect); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (pageReqVO.getTaskName() != null) { |
|
|
|
|
LambdaQueryWrapper<TaskInfoDO> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper.like(TaskInfoDO::getTitle, pageReqVO.getTaskName()); |
|
|
|
|
final List<TaskInfoDO> taskInfoDOS = taskInfoMapper.selectList(wrapper); |
|
|
|
|
if (taskInfoDOS != null || taskInfoDOS.size() > 0) { |
|
|
|
|
final List<Long> collect = taskInfoDOS.stream().map(item -> item.getId()).collect(Collectors.toList()); |
|
|
|
|
pageReqVO.setTaskList(collect); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
final PageResult<EnterpriseInspectionsDO> enterpriseInspectionsDOPageResult = enterpriseInspectionsMapper.selectPage(pageReqVO); |
|
|
|
|
if ( enterpriseInspectionsDOPageResult.getList() != null && enterpriseInspectionsDOPageResult.getList().size() > 0 ) { |
|
|
|
|
enterpriseInspectionsDOPageResult.getList().forEach(item->{ |
|
|
|
|
@ -152,12 +216,24 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
|
|
|
|
|
//根据执法人员id 查询其所属部门
|
|
|
|
|
final Long userId = Long.valueOf(inspectionsLogDOS.get(0).getCreator()); |
|
|
|
|
final AdminUserDO user = adminUserService.getUser(userId); |
|
|
|
|
|
|
|
|
|
if (user == null) { |
|
|
|
|
throw exception(USER_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
final DeptDO dept = deptService.getDept(user.getDeptId()); |
|
|
|
|
item.setDepartment(dept.getName()); |
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
//根据执法人员id 查询其所属部门
|
|
|
|
|
final Long userId = Long.valueOf(item.getUserId()); |
|
|
|
|
final AdminUserDO user = adminUserService.getUser(userId); |
|
|
|
|
|
|
|
|
|
item.setInspectName(user.getRealName()); |
|
|
|
|
|
|
|
|
|
if (user == null) { |
|
|
|
|
throw exception(USER_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
@ -175,6 +251,11 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
|
|
|
|
|
//循环记录id列表
|
|
|
|
|
passOnSaveVO.getInspectionsId().forEach(item->{ |
|
|
|
|
final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(item); |
|
|
|
|
|
|
|
|
|
if (enterpriseInspectionsDO.getUserId() == passOnSaveVO.getUserId()) { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_STATUS_ERROR2); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (enterpriseInspectionsDO == null) { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
@ -187,22 +268,25 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
|
|
|
|
|
//已经开始 就要判断是否是整改状态 整改状态才能转
|
|
|
|
|
enterpriseInspectionsDO.setStatus(4); |
|
|
|
|
} else { |
|
|
|
|
enterpriseInspectionsDO.setStatus(3); |
|
|
|
|
enterpriseInspectionsDO.setStatus(1); |
|
|
|
|
enterpriseInspectionsDO.setUserId(passOnSaveVO.getUserId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
enterpriseInspectionsMapper.updateById(enterpriseInspectionsDO); |
|
|
|
|
|
|
|
|
|
AdminUserDO user = adminUserService.getUser(passOnSaveVO.getUserId()); |
|
|
|
|
if (user == null) { |
|
|
|
|
throw exception(USER_NOT_EXISTS); |
|
|
|
|
if (enterpriseInspectionsDO.getStatus() == 4) { |
|
|
|
|
AdminUserDO user = adminUserService.getUser(passOnSaveVO.getUserId()); |
|
|
|
|
if (user == null) { |
|
|
|
|
throw exception(USER_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
EnterpriseInspectionsDO inspectionsDO = new EnterpriseInspectionsDO(); |
|
|
|
|
inspectionsDO.setEnterpriseId(enterpriseInspectionsDO.getEnterpriseId()); |
|
|
|
|
inspectionsDO.setTaskId(enterpriseInspectionsDO.getTaskId()); |
|
|
|
|
inspectionsDO.setUserId(passOnSaveVO.getUserId()); |
|
|
|
|
inspectionsDO.setInspectName(user.getRealName()); |
|
|
|
|
enterpriseInspectionsMapper.insert(inspectionsDO); |
|
|
|
|
} |
|
|
|
|
EnterpriseInspectionsDO inspectionsDO = new EnterpriseInspectionsDO(); |
|
|
|
|
inspectionsDO.setEnterpriseId(enterpriseInspectionsDO.getEnterpriseId()); |
|
|
|
|
inspectionsDO.setTaskId(enterpriseInspectionsDO.getTaskId()); |
|
|
|
|
|
|
|
|
|
inspectionsDO.setUserId(passOnSaveVO.getUserId()); |
|
|
|
|
inspectionsDO.setInspectName(user.getRealName()); |
|
|
|
|
enterpriseInspectionsMapper.insert(inspectionsDO); |
|
|
|
|
} else { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_STATUS_ERROR); |
|
|
|
|
} |
|
|
|
|
@ -245,5 +329,8 @@ public class EnterpriseInspectionsServiceImpl implements EnterpriseInspectionsSe
|
|
|
|
|
return inspectionsLogDOS.get(0); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public List<EnterpriseInspectionsDO> getEnterpriseInspectionsList(EnterpriseInspectionsPageReqVO pageReqVO) { |
|
|
|
|
return enterpriseInspectionsMapper.selectList(pageReqVO); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
