|
|
|
|
@ -1,5 +1,6 @@
|
|
|
|
|
package cn.iocoder.yudao.module.system.service.inspectionslog; |
|
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseinspections.EnterpriseInspectionsDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.signinlog.SignInLogDO; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.taskinfo.TaskInfoDO; |
|
|
|
|
@ -7,7 +8,10 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
|
import cn.iocoder.yudao.module.system.dal.mysql.enterpriseinspections.EnterpriseInspectionsMapper; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.mysql.signinlog.SignInLogMapper; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.mysql.taskinfo.TaskInfoMapper; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.dept.DeptService; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.enterpriseinspections.EnterpriseInspectionsService; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
|
|
|
|
import com.alibaba.excel.util.StringUtils; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
@ -15,6 +19,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.inspectionslog.vo.*; |
|
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog.InspectionsLogDO; |
|
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult; |
|
|
|
|
@ -49,70 +55,67 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
private TaskInfoMapper taskInfoMapper; |
|
|
|
|
@Resource |
|
|
|
|
private SignInLogMapper signInLogMapper; |
|
|
|
|
@Resource |
|
|
|
|
private EnterpriseInspectionsService enterpriseInspectionsService; |
|
|
|
|
@Resource |
|
|
|
|
private DeptService deptService; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public Long |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional |
|
|
|
|
public void createInspectionsLog(InspectionsLogSaveReqVO createReqVO) { |
|
|
|
|
|
|
|
|
|
//查询执法记录
|
|
|
|
|
EnterpriseInspectionsDO inspections = enterpriseInspectionsMapper.selectById(createReqVO.getInspectionsId()); |
|
|
|
|
if (inspections == null) { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
createInspectionsLog(InspectionsLogSaveReqVO createReqVO) { |
|
|
|
|
//当前用户id
|
|
|
|
|
Long loginUserId = getLoginUserId(); |
|
|
|
|
AdminUserDO user = adminUserService.getUser(loginUserId); |
|
|
|
|
//根据查询出的列表判断执行到哪一步
|
|
|
|
|
LambdaQueryWrapper<InspectionsLogDO> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper.eq(InspectionsLogDO::getInspectionsId, createReqVO.getInspectionsId()); |
|
|
|
|
wrapper.orderByDesc(InspectionsLogDO::getCreateTime); |
|
|
|
|
List<InspectionsLogDO> list = inspectionsLogMapper.selectList(wrapper); |
|
|
|
|
final AdminUserDO user = adminUserService.getUser(loginUserId); |
|
|
|
|
|
|
|
|
|
if (list == null || list.size() == 0) { |
|
|
|
|
//签到
|
|
|
|
|
createReqVO.setStatus(1); |
|
|
|
|
createReqVO.setInspectId(loginUserId); |
|
|
|
|
createReqVO.setInspectName(user.getRealName()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (list != null && createReqVO.getStatus() != null && createReqVO.getStatus() == 1) { |
|
|
|
|
//请不要重复签到
|
|
|
|
|
throw exception(INSPECTIONS_SUCCESS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (list != null && list.get(0).getStatus() == 2) { |
|
|
|
|
throw exception(INSPECTIONS_SUCCESS); |
|
|
|
|
} |
|
|
|
|
//根据查询出的列表判断执行到哪一步
|
|
|
|
|
final InspectionsLogDO inspectionsLogNew = enterpriseInspectionsService.getInspectionsLogNew(createReqVO.getInspectionsId()); |
|
|
|
|
|
|
|
|
|
//没有记录和整改状态为打卡
|
|
|
|
|
if (inspectionsLogNew == null || (inspectionsLogNew != null && inspectionsLogNew.getStatus() == 3)) { |
|
|
|
|
createReqVO.setStatus(0); |
|
|
|
|
InspectionsLogDO inspectionsLog = BeanUtils.toBean(createReqVO, InspectionsLogDO.class); |
|
|
|
|
final int insert = inspectionsLogMapper.insert(inspectionsLog); |
|
|
|
|
if (insert > 0) { |
|
|
|
|
final SignInLogDO signInLogDO = new SignInLogDO(); |
|
|
|
|
signInLogDO.setInsId(inspectionsLog.getId()); |
|
|
|
|
signInLogDO.setUserId(loginUserId); |
|
|
|
|
signInLogDO.setRealName(user.getRealName()); |
|
|
|
|
signInLogDO.setGpsLocation(createReqVO.getGpsLocation()); |
|
|
|
|
if (loginUserId == inspections.getUserId()) { |
|
|
|
|
signInLogDO.setIsInspect(true); |
|
|
|
|
} |
|
|
|
|
signInLogMapper.insert(signInLogDO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 插入
|
|
|
|
|
InspectionsLogDO inspectionsLog = BeanUtils.toBean(createReqVO, InspectionsLogDO.class); |
|
|
|
|
inspectionsLogMapper.insert(inspectionsLog); |
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
//整改需要重新创建子任务
|
|
|
|
|
if (list != null && createReqVO.getStatus() != null && createReqVO.getStatus() == 3) { |
|
|
|
|
//查看打卡记录
|
|
|
|
|
final List<SignInLogDO> signInLog = this.getSignInLog(inspectionsLogNew.getId()); |
|
|
|
|
if (signInLog == null) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//查询父任务，和执法记录
|
|
|
|
|
EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(createReqVO.getInspectionsId()); |
|
|
|
|
if (enterpriseInspectionsDO == null) { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); |
|
|
|
|
//查看当前用户是否已打卡
|
|
|
|
|
final List<Long> collect = signInLog.stream().map(SignInLogDO::getUserId).collect(Collectors.toList()); |
|
|
|
|
if(collect.contains(loginUserId)) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR2); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//添加子任务
|
|
|
|
|
TaskInfoDO taskInfo = new TaskInfoDO(); |
|
|
|
|
taskInfo.setTitle(enterpriseInspectionsDO.getEnterpriseId() + "-" + "整改任务"); |
|
|
|
|
taskInfo.setTaskType(1); //整改默认是普通专项任务类型
|
|
|
|
|
taskInfo.setParentId(enterpriseInspectionsDO.getTaskId()); |
|
|
|
|
taskInfo.setParentType(21); //父子任务类型
|
|
|
|
|
taskInfoMapper.insert(taskInfo); |
|
|
|
|
//添加执法记录
|
|
|
|
|
EnterpriseInspectionsDO enterpriseInspectionsDO1 = new EnterpriseInspectionsDO(); |
|
|
|
|
enterpriseInspectionsDO1.setUserId(getLoginUserId()); |
|
|
|
|
enterpriseInspectionsDO1.setEnterpriseId(enterpriseInspectionsDO.getEnterpriseId()); |
|
|
|
|
enterpriseInspectionsDO1.setTaskId(taskInfo.getId()); |
|
|
|
|
enterpriseInspectionsDO1.setStatus(2); //整改任务默认是启动的状态
|
|
|
|
|
enterpriseInspectionsMapper.insert(enterpriseInspectionsDO1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 返回
|
|
|
|
|
return inspectionsLog.getId(); |
|
|
|
|
signInLogMapper.insert(new SignInLogDO().setInsId(inspectionsLogNew.getId()).setUserId(loginUserId).setRealName(user.getRealName())); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public List<SignInLogDO> getSignInLog(Long insId) { |
|
|
|
|
LambdaQueryWrapper<SignInLogDO> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper.eq(SignInLogDO::getInsId, insId); |
|
|
|
|
return signInLogMapper.selectList(wrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@ -145,7 +148,45 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public PageResult<InspectionsLogDO> getInspectionsLogPage(InspectionsLogPageReqVO pageReqVO) { |
|
|
|
|
return inspectionsLogMapper.selectPage(pageReqVO); |
|
|
|
|
//不显示待确认签到的状态
|
|
|
|
|
pageReqVO.setPageNo(-1); |
|
|
|
|
if (pageReqVO.getStatus() == null) { |
|
|
|
|
pageReqVO.setMrStatus(0); |
|
|
|
|
} |
|
|
|
|
final PageResult<InspectionsLogDO> inspectionsLogDOPageResult = inspectionsLogMapper.selectPage(pageReqVO); |
|
|
|
|
if (inspectionsLogDOPageResult.getList() != null && inspectionsLogDOPageResult.getList().size() > 0) { |
|
|
|
|
inspectionsLogDOPageResult.getList().forEach(item->{ |
|
|
|
|
item.setUserList(this.getInspectionsLogAppListVO(item.getId())); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return inspectionsLogDOPageResult; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//封装
|
|
|
|
|
public List<InspectionsLogAppListVO> getInspectionsLogAppListVO(Long insId) { |
|
|
|
|
List<InspectionsLogAppListVO> appListVO = new ArrayList<>(); |
|
|
|
|
final List<SignInLogDO> signInLog = this.getSignInLog(insId); |
|
|
|
|
if (signInLog != null && signInLog.size() > 0) { |
|
|
|
|
signInLog.forEach(signInLogDO->{ |
|
|
|
|
final AdminUserDO user = adminUserService.getUser(signInLogDO.getUserId()); |
|
|
|
|
if (user == null) { |
|
|
|
|
throw exception(USER_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
InspectionsLogAppListVO appListVO1 = new InspectionsLogAppListVO(); |
|
|
|
|
appListVO1.setRealName(signInLogDO.getRealName()); |
|
|
|
|
appListVO1.setTime(signInLogDO.getCreateTime()); |
|
|
|
|
appListVO1.setUserId(signInLogDO.getUserId()); |
|
|
|
|
appListVO1.setIsInspect(signInLogDO.getIsInspect()); |
|
|
|
|
final DeptDO dept = deptService.getDept(user.getDeptId()); |
|
|
|
|
if (dept != null) { |
|
|
|
|
appListVO1.setDeptName(dept.getName()); |
|
|
|
|
} |
|
|
|
|
appListVO1.setAvtar(user.getAvatar()); |
|
|
|
|
appListVO.add(appListVO1); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
return appListVO; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@ -192,4 +233,78 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
signInLogMapper.insert(signInLogDO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void confirmSignIn(InspectionsLogSaveReqVO createReqVO) { |
|
|
|
|
|
|
|
|
|
//查询执法记录
|
|
|
|
|
final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(createReqVO.getInspectionsId()); |
|
|
|
|
if (enterpriseInspectionsDO == null) { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
//根据查询出的列表判断执行到哪一步
|
|
|
|
|
final InspectionsLogDO inspectionsLogNew = enterpriseInspectionsService.getInspectionsLogNew(createReqVO.getInspectionsId()); |
|
|
|
|
if (inspectionsLogNew == null) { |
|
|
|
|
throw exception(INSPECTIONS_LOG_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
final List<SignInLogDO> signInLog = this.getSignInLog(inspectionsLogNew.getId()); |
|
|
|
|
if (signInLog == null) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//打卡记录里面必须有执行人
|
|
|
|
|
final List<Long> collect = signInLog.stream().map(item -> item.getUserId()).collect(Collectors.toList()); |
|
|
|
|
if(!collect.contains(enterpriseInspectionsDO.getUserId())) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR4); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (signInLog.size() < 2) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR6); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//查看状态等于0 并且起到人员大于2 修改状态
|
|
|
|
|
if (inspectionsLogNew.getStatus() == 0) { |
|
|
|
|
inspectionsLogNew.setStatus(1); |
|
|
|
|
inspectionsLogMapper.updateById(inspectionsLogNew); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@Transactional |
|
|
|
|
public void inspectionsAudit(InspectionsLogSaveReqVO createReqVO) { |
|
|
|
|
|
|
|
|
|
//查询执法记录
|
|
|
|
|
final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(createReqVO.getInspectionsId()); |
|
|
|
|
if (enterpriseInspectionsDO == null) { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//只有当前企业执行人才能提交审核
|
|
|
|
|
if (enterpriseInspectionsDO.getUserId() != getLoginUserId()) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR5); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
InspectionsLogDO updateObj = BeanUtils.toBean(createReqVO, InspectionsLogDO.class); |
|
|
|
|
inspectionsLogMapper.insert(updateObj); |
|
|
|
|
|
|
|
|
|
//修改执行记录状态
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public List<InspectionsLogAppListVO> signInList(Long inspectionsId) { |
|
|
|
|
|
|
|
|
|
//查询最新状态
|
|
|
|
|
final InspectionsLogDO inspectionsLogDO = enterpriseInspectionsService.getInspectionsLogNew(inspectionsId); |
|
|
|
|
if (inspectionsLogDO != null) { |
|
|
|
|
//如果当前状态不是待确认打卡的状态报错
|
|
|
|
|
if (inspectionsLogDO.getStatus() != 0) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR3); |
|
|
|
|
} |
|
|
|
|
//根据记录查询
|
|
|
|
|
return this.getInspectionsLogAppListVO(inspectionsLogDO.getId()); |
|
|
|
|
} |
|
|
|
|
return Collections.emptyList(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
