|
|
|
|
@ -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,9 +102,17 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
if(collect.contains(loginUserId)) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR2); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
signInLogMapper.insert(new SignInLogDO().setInsId(inspectionsLogNew.getId()).setUserId(loginUserId).setRealName(user.getRealName())); |
|
|
|
|
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) { |
|
|
|
|
@ -143,29 +146,57 @@ 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->{ |
|
|
|
|
item.setUserList(this.getInspectionsLogAppListVO(item.getId())); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
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); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return inspectionsLogDOPageResult; |
|
|
|
|
return list; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//封装
|
|
|
|
|
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->{ |
|
|
|
|
@ -194,43 +225,22 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
public List<InspectionsLogDO> list(InspectionsLogPageReqVO pageReqVO) { |
|
|
|
|
QueryWrapper<InspectionsLogDO> wrapper = new QueryWrapper<>(); |
|
|
|
|
wrapper.eq("inspections_id", pageReqVO.getInspectionsId()); |
|
|
|
|
return inspectionsLogMapper.selectList(wrapper); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 协作人员签到 |
|
|
|
|
* @param inspectionsLogId |
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
|
public void cooperateWithSignIn(Long inspectionsLogId) { |
|
|
|
|
// 校验存在
|
|
|
|
|
InspectionsLogDO inspectionsLogDO = inspectionsLogMapper.selectById(inspectionsLogId); |
|
|
|
|
if (inspectionsLogDO == null) { |
|
|
|
|
throw exception(INSPECTIONS_LOG_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//查询真实名称并插入
|
|
|
|
|
AdminUserDO user = adminUserService.getUser(getLoginUserId()); |
|
|
|
|
if (user == null) { |
|
|
|
|
throw exception(USER_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
final List<InspectionsLogDO> list = inspectionsLogMapper.selectList(wrapper); |
|
|
|
|
if (list != null && list.size() > 0) { |
|
|
|
|
list.forEach(item->{ |
|
|
|
|
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()); |
|
|
|
|
item.setCooperateWithName(String.join(",", inspectCollect)); |
|
|
|
|
List<String> withCollect = inspectionsLogAppListVO.stream().filter(item2 -> item2.getIsInspect() == false).map(map3 -> map3.getRealName()).collect(Collectors.toList()); |
|
|
|
|
item.setInspectName(String.join(",", withCollect)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
// 更新
|
|
|
|
|
if (inspectionsLogDO.getCooperateWithIds() == null ) { |
|
|
|
|
inspectionsLogDO.setCooperateWithIds(getLoginUserId().toString()); |
|
|
|
|
inspectionsLogDO.setCooperateWithName(user.getRealName()); |
|
|
|
|
} else { |
|
|
|
|
inspectionsLogDO.setCooperateWithIds(inspectionsLogDO.getCooperateWithIds() + "," + getLoginUserId()); |
|
|
|
|
inspectionsLogDO.setCooperateWithName(inspectionsLogDO.getCooperateWithName() + "," + user.getRealName()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
inspectionsLogMapper.updateById(inspectionsLogDO); |
|
|
|
|
|
|
|
|
|
//插入协同人员打卡记录表
|
|
|
|
|
SignInLogDO signInLogDO = new SignInLogDO(); |
|
|
|
|
signInLogDO.setInsId(inspectionsLogId); |
|
|
|
|
signInLogDO.setUserId(getLoginUserId()); |
|
|
|
|
signInLogMapper.insert(signInLogDO); |
|
|
|
|
return list; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@ -280,26 +290,50 @@ public class InspectionsLogServiceImpl implements InspectionsLogService {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//只有当前企业执行人才能提交审核
|
|
|
|
|
if (enterpriseInspectionsDO.getUserId() != getLoginUserId()) { |
|
|
|
|
if (!getLoginUserId().equals(enterpriseInspectionsDO.getUserId())) { |
|
|
|
|
throw exception(SIGN_IN_LOG_ERROR5); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//修改执行记录状态 添加日志表 方便查询 当前最新的一定是签到 查询出签到记录 和执行记录一起再一次插入
|
|
|
|
|
final InspectionsLogDO inspectionsLogNew = enterpriseInspectionsService.getInspectionsLogNew(createReqVO.getInspectionsId()); |
|
|
|
|
if (inspectionsLogNew == null) { |
|
|
|
|
throw exception(INSPECTIONS_LOG_NOT_EXISTS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
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-> { |
|
|
|
|
//插入执行记录
|
|
|
|
|
SignInLogDO signInLogDO = new SignInLogDO(); |
|
|
|
|
signInLogDO.setInsId(updateObj.getId()); |
|
|
|
|
signInLogDO.setUserId(item.getUserId()); |
|
|
|
|
signInLogDO.setRealName(item.getRealName()); |
|
|
|
|
signInLogDO.setIsInspect(item.getIsInspect()); |
|
|
|
|
signInLogDO.setGpsLocation(item.getGpsLocation()); |
|
|
|
|
newList.add(signInLogDO); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
signInLogMapper.insertBatch(newList); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@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()); |
|
|
|
|
|
