|
|
|
|
@ -10,6 +10,7 @@ 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.fileInfo.FileInfoService; |
|
|
|
|
import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
|
|
|
|
import com.alibaba.excel.util.StringUtils; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
@ -59,6 +60,8 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
private EnterpriseInspectionsService enterpriseInspectionsService; |
|
|
|
|
@Resource |
|
|
|
|
private DeptService deptService; |
|
|
|
|
@Resource |
|
|
|
|
private FileInfoService fileInfoService; |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@Transactional |
|
|
|
|
@ -83,15 +86,7 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
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); |
|
|
|
|
inspectionsLogNew.setId(inspectionsLog.getId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
@ -107,18 +102,17 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
if(collect.contains(loginUserId)) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR2); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
final SignInLogDO signInLogDO = new SignInLogDO(); |
|
|
|
|
signInLogDO.setInsId(inspectionsLogNew.getId()); |
|
|
|
|
signInLogDO.setUserId(loginUserId); |
|
|
|
|
signInLogDO.setRealName(user.getRealName()); |
|
|
|
|
signInLogDO.setGpsLocation(createReqVO.getGpsLocation()); |
|
|
|
|
if (loginUserId == inspections.getUserId()) { |
|
|
|
|
signInLogDO.setIsInspect(true); |
|
|
|
|
} |
|
|
|
|
signInLogMapper.insert(signInLogDO); |
|
|
|
|
|
|
|
|
|
final SignInLogDO signInLogDO = new SignInLogDO(); |
|
|
|
|
signInLogDO.setInsId(inspectionsLogNew.getId()); |
|
|
|
|
signInLogDO.setUserId(loginUserId); |
|
|
|
|
signInLogDO.setRealName(user.getRealName()); |
|
|
|
|
signInLogDO.setGpsLocation(createReqVO.getGpsLocation()); |
|
|
|
|
if (loginUserId.equals(inspections.getUserId())) { |
|
|
|
|
signInLogDO.setIsInspect(true); |
|
|
|
|
} |
|
|
|
|
signInLogMapper.insert(signInLogDO); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public List<SignInLogDO> getSignInLog(Long insId) { |
|
|
|
|
@ -152,34 +146,52 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public InspectionsLogDO getInspectionsLog(Long id) { |
|
|
|
|
//判断是否存在
|
|
|
|
|
validateInspectionsLogExists(id); |
|
|
|
|
return inspectionsLogMapper.selectById(id); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public PageResult<InspectionsLogDO> getInspectionsLogPage(InspectionsLogPageReqVO pageReqVO) { |
|
|
|
|
public List<InspectionsLogDO> getInspectionsLogPage(InspectionsLogPageReqVO 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->{ |
|
|
|
|
final EnterpriseInspectionsDO enterpriseInspectionsDO = enterpriseInspectionsMapper.selectById(item.getInspectionsId()); |
|
|
|
|
if (enterpriseInspectionsDO == null) { |
|
|
|
|
throw exception(ENTERPRISE_INSPECTIONS_NOT_EXISTS); |
|
|
|
|
|
|
|
|
|
List<InspectionsLogDO> list = new ArrayList<>(); |
|
|
|
|
final InspectionsLogDO inspectionsLogNew = enterpriseInspectionsService.getInspectionsLogNew(pageReqVO.getInspectionsId()); |
|
|
|
|
if ( inspectionsLogNew != null ) { |
|
|
|
|
|
|
|
|
|
//根据打卡次数判断 是否是二次整改
|
|
|
|
|
LambdaQueryWrapper<InspectionsLogDO> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
wrapper.eq(InspectionsLogDO::getInspectionsId, pageReqVO.getInspectionsId()); |
|
|
|
|
wrapper.eq(InspectionsLogDO::getStatus, 3); |
|
|
|
|
final List<InspectionsLogDO> listOld = inspectionsLogMapper.selectList(wrapper); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (listOld != null && listOld.size() > 0) { |
|
|
|
|
listOld.forEach(item->{ |
|
|
|
|
item.setUserList(this.getInspectionsLogAppListVO(inspectionsLogNew.getId())); |
|
|
|
|
list.add(item); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (inspectionsLogNew.getStatus() != 3) { |
|
|
|
|
//查看打卡记录
|
|
|
|
|
final List<SignInLogDO> signInLog = this.getSignInLog(inspectionsLogNew.getId()); |
|
|
|
|
if (signInLog == null) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR); |
|
|
|
|
} |
|
|
|
|
inspectionsLogNew.setUserList(this.getInspectionsLogAppListVO(inspectionsLogNew.getId())); |
|
|
|
|
list.add(inspectionsLogNew); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
item.setUserList(this.getInspectionsLogAppListVO(item.getId())); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return inspectionsLogDOPageResult; |
|
|
|
|
return list; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//封装
|
|
|
|
|
public List<InspectionsLogAppListVO> getInspectionsLogAppListVO(Long insId) { |
|
|
|
|
List<InspectionsLogAppListVO> appListVO = new ArrayList<>(); |
|
|
|
|
@ -216,7 +228,7 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
final List<InspectionsLogDO> list = inspectionsLogMapper.selectList(wrapper); |
|
|
|
|
if (list != null && list.size() > 0) { |
|
|
|
|
list.forEach(item->{ |
|
|
|
|
if (item.getStatus() != null && item.getStatus() == 1) { |
|
|
|
|
if (item.getStatus() != null) { |
|
|
|
|
final List<InspectionsLogAppListVO> inspectionsLogAppListVO = this.getInspectionsLogAppListVO(item.getId()); |
|
|
|
|
if (inspectionsLogAppListVO != null) { |
|
|
|
|
List<String> inspectCollect = inspectionsLogAppListVO.stream().filter(item2 -> item2.getIsInspect() == true).map(map3 -> map3.getRealName()).collect(Collectors.toList()); |
|
|
|
|
@ -231,7 +243,6 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
return list; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public void confirmSignIn(InspectionsLogSaveReqVO createReqVO) { |
|
|
|
|
|
|
|
|
|
@ -279,7 +290,7 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//只有当前企业执行人才能提交审核
|
|
|
|
|
if (enterpriseInspectionsDO.getUserId() != getLoginUserId()) { |
|
|
|
|
if (!getLoginUserId().equals(enterpriseInspectionsDO.getUserId())) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR5); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -292,11 +303,12 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
InspectionsLogDO updateObj = BeanUtils.toBean(createReqVO, InspectionsLogDO.class); |
|
|
|
|
inspectionsLogMapper.insert(updateObj); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<SignInLogDO> signInLogDOS = signInLogMapper.selectList(new QueryWrapper<SignInLogDO>().eq("ins_id", inspectionsLogNew.getId())); |
|
|
|
|
|
|
|
|
|
//插入图片
|
|
|
|
|
fileInfoService.saveFilesByDictData(createReqVO.getFileIds(), 644l,2l, updateObj.getId().toString()); |
|
|
|
|
|
|
|
|
|
//插入签到人 方便查询
|
|
|
|
|
if (signInLogDOS == null || signInLogDOS.size() > 0) { |
|
|
|
|
List<SignInLogDO> newList = new ArrayList<>(); |
|
|
|
|
signInLogDOS.forEach(item-> { |
|
|
|
|
@ -317,14 +329,12 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
|
|
|
|
|
@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);
|
|
|
|
|
// }
|
|
|
|
|
if (inspectionsLogDO.getStatus() == 3) { |
|
|
|
|
return Collections.emptyList(); |
|
|
|
|
} |
|
|
|
|
//根据记录查询
|
|
|
|
|
return this.getInspectionsLogAppListVO(inspectionsLogDO.getId()); |
|
|
|
|
} |
|
|
|
|
|
