|
|
|
@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.hnac.hzims.message.fegin.IMessagePushClient; |
|
|
|
import com.hnac.hzims.message.fegin.IMessagePushClient; |
|
|
|
import com.hnac.hzims.message.req.PushExtrasReq; |
|
|
|
import com.hnac.hzims.message.req.PushExtrasReq; |
|
|
|
import com.hnac.hzims.operational.OperationalConstants; |
|
|
|
import com.hnac.hzims.operational.OperationalConstants; |
|
|
|
@ -37,6 +39,7 @@ import com.hnac.hzims.vo.SafeCheckStatisticVO; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.RandomUtils; |
|
|
|
import org.apache.commons.lang3.RandomUtils; |
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springblade.core.log.exception.ServiceException; |
|
|
|
import org.springblade.core.log.exception.ServiceException; |
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
import org.springblade.core.mp.support.Condition; |
|
|
|
import org.springblade.core.mp.support.Condition; |
|
|
|
@ -71,427 +74,433 @@ import java.util.stream.Collectors; |
|
|
|
@Slf4j |
|
|
|
@Slf4j |
|
|
|
@AllArgsConstructor |
|
|
|
@AllArgsConstructor |
|
|
|
public class OperAccessTaskServiceImpl extends BaseServiceImpl<OperAccessTaskMapper, OperAccessTaskEntity> implements IOperAccessTaskService { |
|
|
|
public class OperAccessTaskServiceImpl extends BaseServiceImpl<OperAccessTaskMapper, OperAccessTaskEntity> implements IOperAccessTaskService { |
|
|
|
private final IFlowClient flowClient; |
|
|
|
private final IFlowClient flowClient; |
|
|
|
private final IDangerSourceClient dangerSourceClient; |
|
|
|
private final IDangerSourceClient dangerSourceClient; |
|
|
|
private final IOperAccessTaskDetailService detailService; |
|
|
|
private final IOperAccessTaskDetailService detailService; |
|
|
|
private final IOperAccessStatisticsService statisticsService; |
|
|
|
private final IOperAccessStatisticsService statisticsService; |
|
|
|
private final IOperAccessContentService contentService; |
|
|
|
private final IOperAccessContentService contentService; |
|
|
|
private final OperAccessTaskMapper mapper; |
|
|
|
private final OperAccessTaskMapper mapper; |
|
|
|
private final IMessagePushClient messagePushClient; |
|
|
|
private final IMessagePushClient messagePushClient; |
|
|
|
private final OperPhenomenonMapper operPhenomenonMapper; |
|
|
|
private final OperPhenomenonMapper operPhenomenonMapper; |
|
|
|
private final IUserClient userClient; |
|
|
|
private final IUserClient userClient; |
|
|
|
private final ISpareClient assetsClient; |
|
|
|
private final ISpareClient assetsClient; |
|
|
|
private final IOperAccessMaterialService materialService; |
|
|
|
private final IOperAccessMaterialService materialService; |
|
|
|
private final IOperDefectService defectService; |
|
|
|
private final IOperDefectService defectService; |
|
|
|
private final IOperDefectStatisticsService defectStatisticsService; |
|
|
|
private final IOperDefectStatisticsService defectStatisticsService; |
|
|
|
|
|
|
|
|
|
|
|
@Transactional |
|
|
|
@Transactional |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public R doSave(OperAccessTaskDTO req) { |
|
|
|
public R doSave(OperAccessTaskDTO req) { |
|
|
|
req.setCode("TASK" + DateUtil.format(DateUtil.now(), DateUtil.PATTERN_DATETIME_MINI) + new DecimalFormat("###").format(RandomUtils.nextInt(0, 999))); |
|
|
|
req.setCode("TASK" + DateUtil.format(DateUtil.now(), DateUtil.PATTERN_DATETIME_MINI) + new DecimalFormat("###").format(RandomUtils.nextInt(0, 999))); |
|
|
|
List<OperAccessMaterialEntity> materialEntityList = JSONObject.parseArray(JSON.toJSONString(req.getAccessMaterials()),OperAccessMaterialEntity.class); |
|
|
|
List<OperAccessMaterialEntity> materialEntityList = JSONObject.parseArray(JSON.toJSONString(req.getAccessMaterials()), OperAccessMaterialEntity.class); |
|
|
|
if(super.save(req)){ |
|
|
|
if (super.save(req)) { |
|
|
|
if(CollectionUtil.isNotEmpty(materialEntityList)) { |
|
|
|
if (CollectionUtil.isNotEmpty(materialEntityList)) { |
|
|
|
materialEntityList.stream().map(material->{ |
|
|
|
materialEntityList.stream().map(material -> { |
|
|
|
material.setPlanId(null); |
|
|
|
material.setPlanId(null); |
|
|
|
material.setId(null); |
|
|
|
material.setId(null); |
|
|
|
material.setTaskId(req.getId()); |
|
|
|
material.setTaskId(req.getId()); |
|
|
|
return material; |
|
|
|
return material; |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
materialService.saveOrUpdateBatch(materialEntityList); |
|
|
|
materialService.saveOrUpdateBatch(materialEntityList); |
|
|
|
} |
|
|
|
} |
|
|
|
this.updateDetails(req.getId(), req.getAccessTaskDetails()); |
|
|
|
this.updateDetails(req.getId(), req.getAccessTaskDetails()); |
|
|
|
//开启检修任务流程
|
|
|
|
//开启检修任务流程
|
|
|
|
R<BladeFlow> bladeFlowR = flowClient.startProcessInstanceContainNameByKey( |
|
|
|
R<BladeFlow> bladeFlowR = flowClient.startProcessInstanceContainNameByKey("access_task_execute", FlowUtil.getBusinessKey("hzims_oper_access_task", String.valueOf(req.getId())), req.getName(), new HashMap<String, Object>() {{ |
|
|
|
"access_task_execute", |
|
|
|
put("taskId", req.getId()); |
|
|
|
FlowUtil.getBusinessKey("hzims_oper_access_task",String.valueOf(req.getId())), |
|
|
|
put("handler", TaskUtil.getTaskUser(req.getHandler().toString())); |
|
|
|
req.getName(), |
|
|
|
put("creator", TaskUtil.getTaskUser(AuthUtil.getUserId().toString())); |
|
|
|
new HashMap<String, Object>() {{ |
|
|
|
}}); |
|
|
|
put("taskId", req.getId()); |
|
|
|
Assert.isTrue(bladeFlowR.isSuccess() && ObjectUtil.isNotEmpty(bladeFlowR.getData()), () -> { |
|
|
|
put("handler", TaskUtil.getTaskUser(req.getHandler().toString())); |
|
|
|
throw new ServiceException("保存检修任务失败，开启检修任务流程失败！"); |
|
|
|
put("creator", TaskUtil.getTaskUser(AuthUtil.getUserId().toString())); |
|
|
|
}); |
|
|
|
}}); |
|
|
|
String processInstanceId = bladeFlowR.getData().getProcessInstanceId(); |
|
|
|
Assert.isTrue(bladeFlowR.isSuccess() && ObjectUtil.isNotEmpty(bladeFlowR.getData()),()->{ |
|
|
|
req.setProcessInstanceId(processInstanceId); |
|
|
|
throw new ServiceException("保存检修任务失败，开启检修任务流程失败！"); |
|
|
|
super.updateById(new OperAccessTaskEntity() {{ |
|
|
|
}); |
|
|
|
setId(req.getId()); |
|
|
|
String processInstanceId = bladeFlowR.getData().getProcessInstanceId(); |
|
|
|
setProcessInstanceId(processInstanceId); |
|
|
|
req.setProcessInstanceId(processInstanceId); |
|
|
|
}}); |
|
|
|
super.updateById(new OperAccessTaskEntity() {{ |
|
|
|
} |
|
|
|
setId(req.getId()); |
|
|
|
return R.success("OK"); |
|
|
|
setProcessInstanceId(processInstanceId); |
|
|
|
} |
|
|
|
}}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return R.success("OK"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public R doUpdateById(OperAccessTaskDTO req, ComleteTask comleteTask, Long handler) { |
|
|
|
public R doUpdateById(OperAccessTaskDTO req, ComleteTask comleteTask, Long handler) { |
|
|
|
super.updateById(req); |
|
|
|
super.updateById(req); |
|
|
|
OperAccessTaskEntity entity = super.getById(req.getId()); |
|
|
|
OperAccessTaskEntity entity = super.getById(req.getId()); |
|
|
|
|
|
|
|
|
|
|
|
if (req.getStatus() == AccessConstants.ACCESS_TASK_STATUS_4) { |
|
|
|
if (req.getStatus() == AccessConstants.ACCESS_TASK_STATUS_4) { |
|
|
|
List<OperAccessStatisticsEntity> statisticsList = statisticsService.list(new LambdaQueryWrapper<OperAccessStatisticsEntity>() {{ |
|
|
|
List<OperAccessStatisticsEntity> statisticsList = statisticsService.list(new LambdaQueryWrapper<OperAccessStatisticsEntity>() {{ |
|
|
|
eq(OperAccessStatisticsEntity::getTaskId, req.getId()); |
|
|
|
eq(OperAccessStatisticsEntity::getTaskId, req.getId()); |
|
|
|
}}); |
|
|
|
}}); |
|
|
|
//台账
|
|
|
|
//台账
|
|
|
|
if (CollectionUtil.isEmpty(statisticsList)) { |
|
|
|
if (CollectionUtil.isEmpty(statisticsList)) { |
|
|
|
OperAccessStatisticsDTO statisticsDTO = BeanUtil.copy(entity, OperAccessStatisticsDTO.class); |
|
|
|
OperAccessStatisticsDTO statisticsDTO = BeanUtil.copy(entity, OperAccessStatisticsDTO.class); |
|
|
|
statisticsDTO.setId(null); |
|
|
|
statisticsDTO.setId(null); |
|
|
|
statisticsDTO.setTaskId(entity.getId()); |
|
|
|
statisticsDTO.setTaskId(entity.getId()); |
|
|
|
statisticsDTO.setManager(entity.getHandler()); |
|
|
|
statisticsDTO.setManager(entity.getHandler()); |
|
|
|
OperAccessContentEntity accessContentEntity = contentService.getById(req.getId()); |
|
|
|
OperAccessContentEntity accessContentEntity = contentService.getById(req.getId()); |
|
|
|
if(ObjectUtil.isNotEmpty(accessContentEntity)){ |
|
|
|
if (ObjectUtil.isNotEmpty(accessContentEntity)) { |
|
|
|
statisticsDTO.setPid(accessContentEntity.getLibraryId()); |
|
|
|
statisticsDTO.setPid(accessContentEntity.getLibraryId()); |
|
|
|
} |
|
|
|
} |
|
|
|
statisticsService.doSave(statisticsDTO); |
|
|
|
statisticsService.doSave(statisticsDTO); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//材料库出库
|
|
|
|
//材料库出库
|
|
|
|
if(CollectionUtil.isNotEmpty(req.getAccessMaterials())){ |
|
|
|
if (CollectionUtil.isNotEmpty(req.getAccessMaterials())) { |
|
|
|
List<OperAccessMaterialDTO> materialDTOList = req.getAccessMaterials(); |
|
|
|
List<OperAccessMaterialDTO> materialDTOList = req.getAccessMaterials(); |
|
|
|
for (OperAccessMaterialDTO materialDTO : materialDTOList) { |
|
|
|
for (OperAccessMaterialDTO materialDTO : materialDTOList) { |
|
|
|
SpRecordEntity recordEntity = new SpRecordEntity(); |
|
|
|
SpRecordEntity recordEntity = new SpRecordEntity(); |
|
|
|
recordEntity.setSpBasicId(materialDTO.getSpBasicId()); |
|
|
|
recordEntity.setSpBasicId(materialDTO.getSpBasicId()); |
|
|
|
recordEntity.setAmount(materialDTO.getNumber()); |
|
|
|
recordEntity.setAmount(materialDTO.getNumber()); |
|
|
|
recordEntity.setWarehouseId(materialDTO.getWarehouseId()); |
|
|
|
recordEntity.setWarehouseId(materialDTO.getWarehouseId()); |
|
|
|
recordEntity.setHandler(req.getHandler()); |
|
|
|
recordEntity.setHandler(req.getHandler()); |
|
|
|
recordEntity.setCreateDept(req.getCreateDept()); |
|
|
|
recordEntity.setCreateDept(req.getCreateDept()); |
|
|
|
recordEntity.setCreateUser(req.getCreateUser()); |
|
|
|
recordEntity.setCreateUser(req.getCreateUser()); |
|
|
|
Boolean result = assetsClient.warehouseOut(recordEntity); |
|
|
|
Boolean result = assetsClient.warehouseOut(recordEntity); |
|
|
|
if(!result) { |
|
|
|
if (!result) { |
|
|
|
return R.fail("出库失败"); |
|
|
|
return R.fail("出库失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
materialDTO.setTaskId(entity.getId()); |
|
|
|
materialDTO.setTaskId(entity.getId()); |
|
|
|
materialDTO.setPlanId(entity.getPlanId()); |
|
|
|
materialDTO.setPlanId(entity.getPlanId()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//审核完成 关闭工作流
|
|
|
|
//审核完成 关闭工作流
|
|
|
|
R flowResult = flowClient.completeTask(comleteTask); |
|
|
|
R flowResult = flowClient.completeTask(comleteTask); |
|
|
|
this.finishDefectFlow(entity); |
|
|
|
this.finishDefectFlow(entity); |
|
|
|
|
|
|
|
|
|
|
|
if(!flowResult.isSuccess()) { |
|
|
|
if (!flowResult.isSuccess()) { |
|
|
|
throw new ServiceException(flowResult.getMsg()); |
|
|
|
throw new ServiceException(flowResult.getMsg()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (req.getStatus() == AccessConstants.ACCESS_TASK_STATUS_2) { |
|
|
|
|
|
|
|
updateMaterials(entity.getPlanId(), entity.getId(), req.getAccessMaterials()); |
|
|
|
|
|
|
|
//工作流下一步
|
|
|
|
|
|
|
|
completeTask(comleteTask, handler, entity.getProcessInstanceId(), entity.getCreateDept()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
else if (req.getStatus() == AccessConstants.ACCESS_TASK_STATUS_2) { |
|
|
|
//如果任务审批未通过 需重新开票 将任务ticketId置空
|
|
|
|
updateMaterials(entity.getPlanId(), entity.getId(), req.getAccessMaterials()); |
|
|
|
else if (req.getStatus() == AccessConstants.ACCESS_TASK_STATUS_3) { |
|
|
|
//工作流下一步
|
|
|
|
LambdaUpdateWrapper<OperAccessTaskEntity> updateWrapper = new LambdaUpdateWrapper<>(); |
|
|
|
completeTask(comleteTask, handler, entity.getProcessInstanceId(), entity.getCreateDept()); |
|
|
|
updateWrapper.set(OperAccessTaskEntity::getTicketId, null); |
|
|
|
} |
|
|
|
updateWrapper.eq(OperAccessTaskEntity::getId, entity.getId()); |
|
|
|
|
|
|
|
super.update(updateWrapper); |
|
|
|
|
|
|
|
R result = flowClient.completeTask(comleteTask); |
|
|
|
|
|
|
|
if (!result.isSuccess()) { |
|
|
|
|
|
|
|
throw new ServiceException(result.getMsg()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//如果任务审批未通过 需重新开票 将任务ticketId置空
|
|
|
|
} |
|
|
|
else if(req.getStatus() == AccessConstants.ACCESS_TASK_STATUS_3) { |
|
|
|
return R.data("操作成功！"); |
|
|
|
LambdaUpdateWrapper<OperAccessTaskEntity> updateWrapper = new LambdaUpdateWrapper<>(); |
|
|
|
} |
|
|
|
updateWrapper.set(OperAccessTaskEntity::getTicketId, null); |
|
|
|
|
|
|
|
updateWrapper.eq(OperAccessTaskEntity::getId, entity.getId()); |
|
|
|
|
|
|
|
super.update(updateWrapper); |
|
|
|
|
|
|
|
R result = flowClient.completeTask(comleteTask); |
|
|
|
|
|
|
|
if(!result.isSuccess()){ |
|
|
|
|
|
|
|
throw new ServiceException(result.getMsg()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
@Override |
|
|
|
return R.data("操作成功！"); |
|
|
|
public R<OperAccessTaskVO> detail(Long id) { |
|
|
|
} |
|
|
|
OperAccessTaskVO detail = OperAccessTaskWrapper.build().entityVO(super.getById(id)); |
|
|
|
|
|
|
|
detail.setDangerSources(dangerSourceClient.details(detail.getSafeInfos().split(","))); |
|
|
|
|
|
|
|
detail.setDetails(OperAccessTaskDetailWrapper.build().listVO(detailService.list(new LambdaQueryWrapper<OperAccessTaskDetailEntity>() {{ |
|
|
|
|
|
|
|
eq(OperAccessTaskDetailEntity::getTaskId, id); |
|
|
|
|
|
|
|
}}))); |
|
|
|
|
|
|
|
detail.setAccessMaterials(materialService.getList(null, String.valueOf(id))); |
|
|
|
|
|
|
|
if (Func.isNotEmpty(id)) { |
|
|
|
|
|
|
|
OperAccessTaskVO operAccessTaskVO = mapper.getAccessPlanByTaskId(id.toString()); |
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(operAccessTaskVO)) { |
|
|
|
|
|
|
|
detail.setPlanName(operAccessTaskVO.getPlanName()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return R.data(detail); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public R<OperAccessTaskVO> detail(Long id) { |
|
|
|
public R<IPage<OperAccessTaskVO>> list(OperAccessTaskDTO req, Query query) { |
|
|
|
OperAccessTaskVO detail = OperAccessTaskWrapper.build().entityVO(super.getById(id)); |
|
|
|
IPage<OperAccessTaskVO> page = Condition.getPage(query); |
|
|
|
detail.setDangerSources(dangerSourceClient.details(detail.getSafeInfos().split(","))); |
|
|
|
List<OperAccessTaskVO> data = mapper.pageCondition(page, req); |
|
|
|
detail.setDetails( |
|
|
|
page.setRecords(OperAccessTaskWrapper.build().listVOExtras(data)); |
|
|
|
OperAccessTaskDetailWrapper.build().listVO( |
|
|
|
return R.data(page); |
|
|
|
detailService.list(new LambdaQueryWrapper<OperAccessTaskDetailEntity>() {{ |
|
|
|
} |
|
|
|
eq(OperAccessTaskDetailEntity::getTaskId, id); |
|
|
|
|
|
|
|
}}) |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
detail.setAccessMaterials(materialService.getList(null, String.valueOf(id))); |
|
|
|
|
|
|
|
if(Func.isNotEmpty(id)){ |
|
|
|
|
|
|
|
OperAccessTaskVO operAccessTaskVO = mapper.getAccessPlanByTaskId(id.toString()); |
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(operAccessTaskVO)){ |
|
|
|
|
|
|
|
detail.setPlanName(operAccessTaskVO.getPlanName()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return R.data(detail); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public R<IPage<OperAccessTaskVO>> list(OperAccessTaskDTO req, Query query) { |
|
|
|
public List<OperAccessTaskEntity> getByEmCode(String emCode, List<String> list) { |
|
|
|
IPage<OperAccessTaskVO> page = Condition.getPage(query); |
|
|
|
return this.baseMapper.selectByEmCode(emCode, list); |
|
|
|
List<OperAccessTaskVO> data = mapper.pageCondition(page, req); |
|
|
|
} |
|
|
|
page.setRecords(OperAccessTaskWrapper.build().listVOExtras(data)); |
|
|
|
|
|
|
|
return R.data(page); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public List<OperAccessTaskEntity> getByEmCode(String emCode, List<String> list) { |
|
|
|
public List<AccessReportVO> getAccessTaskByDisposer(LocalDate startDate, LocalDate endDate, List<Long> deptIdList) { |
|
|
|
return this.baseMapper.selectByEmCode(emCode,list); |
|
|
|
List<AccessReportVO> inspectOrAccessReportVOList = new ArrayList<>(); |
|
|
|
} |
|
|
|
//获取月份内的检修任务
|
|
|
|
|
|
|
|
List<OperAccessTaskEntity> operAccessTaskEntityList = this.list(new LambdaQueryWrapper<OperAccessTaskEntity>() {{ |
|
|
|
|
|
|
|
ge(OperAccessTaskEntity::getPlanStartTime, startDate); |
|
|
|
|
|
|
|
le(OperAccessTaskEntity::getPlanStartTime, endDate); |
|
|
|
|
|
|
|
in(OperAccessTaskEntity::getCreateDept, deptIdList); |
|
|
|
|
|
|
|
}}); |
|
|
|
|
|
|
|
//组合处理人
|
|
|
|
|
|
|
|
Map<Long, List<OperAccessTaskEntity>> mapByDisposer = operAccessTaskEntityList.stream().collect(Collectors.groupingBy(OperAccessTaskEntity::getHandler)); |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
mapByDisposer.forEach((userId, list) -> { |
|
|
|
public List<AccessReportVO> getAccessTaskByDisposer(LocalDate startDate, LocalDate endDate, List<Long> deptIdList) { |
|
|
|
AccessReportVO accessReportVO = new AccessReportVO(); |
|
|
|
List<AccessReportVO> inspectOrAccessReportVOList = new ArrayList<>(); |
|
|
|
accessReportVO.setUserName(UserCache.getUser(userId).getName()); |
|
|
|
//获取月份内的检修任务
|
|
|
|
accessReportVO.setData(list); |
|
|
|
List<OperAccessTaskEntity> operAccessTaskEntityList = this.list(new LambdaQueryWrapper<OperAccessTaskEntity>(){{ |
|
|
|
//已完成情况
|
|
|
|
ge(OperAccessTaskEntity::getPlanStartTime,startDate); |
|
|
|
List<OperAccessTaskEntity> finishList = list.stream().filter(o -> AccessConstants.ACCESS_TASK_STATUS_4 == o.getStatus()).collect(Collectors.toList()); |
|
|
|
le(OperAccessTaskEntity::getPlanStartTime,endDate); |
|
|
|
accessReportVO.setCompleteNum(finishList.size()); |
|
|
|
in(OperAccessTaskEntity::getCreateDept,deptIdList); |
|
|
|
accessReportVO.setCompleteSituation(finishList.size() + ""); |
|
|
|
}}); |
|
|
|
//未完成情况
|
|
|
|
//组合处理人
|
|
|
|
List<OperAccessTaskEntity> immatureList = list.stream().filter(o -> AccessConstants.ACCESS_TASK_STATUS_4 != o.getStatus()).collect(Collectors.toList()); |
|
|
|
Map<Long,List<OperAccessTaskEntity>> mapByDisposer = operAccessTaskEntityList.stream().collect(Collectors.groupingBy(OperAccessTaskEntity::getHandler)); |
|
|
|
accessReportVO.setIncompleteNum(immatureList.size()); |
|
|
|
|
|
|
|
accessReportVO.setIncompleteSituation(immatureList.size() + ""); |
|
|
|
|
|
|
|
//工时
|
|
|
|
|
|
|
|
int hours = list.stream().filter(o -> o.getActHours() != null).collect(Collectors.summingInt(OperAccessTaskEntity::getActHours)); |
|
|
|
|
|
|
|
accessReportVO.setHours(hours); |
|
|
|
|
|
|
|
//发现问题数量
|
|
|
|
|
|
|
|
List<OperPhenomenonEntity> operPhenomenonEntityList = operPhenomenonMapper.selectList(new LambdaQueryWrapper<OperPhenomenonEntity>() {{ |
|
|
|
|
|
|
|
eq(OperPhenomenonEntity::getFinder, userId); |
|
|
|
|
|
|
|
ge(OperPhenomenonEntity::getFindTime, startDate); |
|
|
|
|
|
|
|
le(OperPhenomenonEntity::getFindTime, endDate); |
|
|
|
|
|
|
|
eq(OperPhenomenonEntity::getSourceCode, DefectConstant.DefectSourceEnum.JX.getStatus()); |
|
|
|
|
|
|
|
}}); |
|
|
|
|
|
|
|
accessReportVO.setFindProblemCount(operPhenomenonEntityList.size()); |
|
|
|
|
|
|
|
inspectOrAccessReportVOList.add(accessReportVO); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
return inspectOrAccessReportVOList; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
mapByDisposer.forEach((userId,list)->{ |
|
|
|
@Override |
|
|
|
AccessReportVO accessReportVO = new AccessReportVO(); |
|
|
|
public List<AccessReportVO> getAccessTaskByDisposer(Map<String, Object> params) { |
|
|
|
accessReportVO.setUserName(UserCache.getUser(userId).getName()); |
|
|
|
LocalDate startDate = LocalDate.parse(params.get("startDate").toString(), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATE)); |
|
|
|
accessReportVO.setData(list); |
|
|
|
LocalDate endDate = LocalDate.parse(params.get("endDate").toString(), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATE)); |
|
|
|
//已完成情况
|
|
|
|
List<Long> deptIdList = (List<Long>) params.get("deptId"); |
|
|
|
List<OperAccessTaskEntity> finishList = list.stream().filter(o-> AccessConstants.ACCESS_TASK_STATUS_4 == o.getStatus()).collect(Collectors.toList()); |
|
|
|
return getAccessTaskByDisposer(startDate, endDate, deptIdList); |
|
|
|
accessReportVO.setCompleteNum(finishList.size()); |
|
|
|
} |
|
|
|
accessReportVO.setCompleteSituation(finishList.size()+""); |
|
|
|
|
|
|
|
//未完成情况
|
|
|
|
|
|
|
|
List<OperAccessTaskEntity> immatureList = list.stream().filter(o-> AccessConstants.ACCESS_TASK_STATUS_4 != o.getStatus()).collect(Collectors.toList()); |
|
|
|
|
|
|
|
accessReportVO.setIncompleteNum(immatureList.size()); |
|
|
|
|
|
|
|
accessReportVO.setIncompleteSituation(immatureList.size()+""); |
|
|
|
|
|
|
|
//工时
|
|
|
|
|
|
|
|
int hours = list.stream().filter(o->o.getActHours() != null).collect(Collectors.summingInt(OperAccessTaskEntity::getActHours)); |
|
|
|
|
|
|
|
accessReportVO.setHours(hours); |
|
|
|
|
|
|
|
//发现问题数量
|
|
|
|
|
|
|
|
List<OperPhenomenonEntity> operPhenomenonEntityList = operPhenomenonMapper.selectList(new LambdaQueryWrapper<OperPhenomenonEntity>(){{ |
|
|
|
|
|
|
|
eq(OperPhenomenonEntity::getFinder,userId); |
|
|
|
|
|
|
|
ge(OperPhenomenonEntity::getFindTime,startDate); |
|
|
|
|
|
|
|
le(OperPhenomenonEntity::getFindTime,endDate); |
|
|
|
|
|
|
|
eq(OperPhenomenonEntity::getSourceCode, DefectConstant.DefectSourceEnum.JX.getStatus()); |
|
|
|
|
|
|
|
}}); |
|
|
|
|
|
|
|
accessReportVO.setFindProblemCount(operPhenomenonEntityList.size()); |
|
|
|
|
|
|
|
inspectOrAccessReportVOList.add(accessReportVO); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
return inspectOrAccessReportVOList; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public List<AccessReportVO> getAccessTaskByDisposer(Map<String,Object> params) { |
|
|
|
public List<Map<String, Object>> getAccessConclusion(Map<String, Object> params) { |
|
|
|
LocalDate startDate = LocalDate.parse(params.get("startDate").toString(), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATE)); |
|
|
|
return mapper.getAccessConclusion(params); |
|
|
|
LocalDate endDate = LocalDate.parse(params.get("endDate").toString(), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATE)); |
|
|
|
} |
|
|
|
List<Long> deptIdList = (List<Long>)params.get("deptId"); |
|
|
|
|
|
|
|
return getAccessTaskByDisposer(startDate,endDate,deptIdList); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public List<Map<String, Object>> getAccessConclusion(Map<String, Object> params) { |
|
|
|
public List<OperAccessTaskEntity> getAccessTask(String startTime, String endTime, List<Long> list) { |
|
|
|
return mapper.getAccessConclusion(params); |
|
|
|
return this.baseMapper.selectAccessTask(startTime, endTime, list); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
/** |
|
|
|
public List<OperAccessTaskEntity> getAccessTask(String startTime,String endTime,List<Long> list) { |
|
|
|
* 调整明细 |
|
|
|
return this.baseMapper.selectAccessTask(startTime,endTime,list); |
|
|
|
* |
|
|
|
} |
|
|
|
* @author xiashandong |
|
|
|
|
|
|
|
**/ |
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
|
|
|
|
public void updateDetails(long taskId, List<OperAccessTaskDetailDTO> details) { |
|
|
|
|
|
|
|
if (CollectionUtils.isEmpty(details)) { |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
//查询已经存在的明细，并删除部分需要删除的
|
|
|
|
* 调整明细 |
|
|
|
List<OperAccessTaskDetailEntity> existsDetails = detailService.list(new LambdaQueryWrapper<OperAccessTaskDetailEntity>() {{ |
|
|
|
* |
|
|
|
eq(OperAccessTaskDetailEntity::getTaskId, taskId); |
|
|
|
* @author xiashandong |
|
|
|
eq(OperAccessTaskDetailEntity::getIsDeleted, 0L); |
|
|
|
**/ |
|
|
|
}}); |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
Set<Long> detailIds = details.stream().filter(o -> o.getId() != null).map(OperAccessTaskDetailDTO::getId).collect(Collectors.toSet()); |
|
|
|
public void updateDetails(long taskId, List<OperAccessTaskDetailDTO> details) { |
|
|
|
List<Long> ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessTaskDetailEntity::getId).collect(Collectors.toList()); |
|
|
|
if (CollectionUtils.isEmpty(details)) { |
|
|
|
if (!CollectionUtils.isEmpty(ids)) { |
|
|
|
return; |
|
|
|
detailService.deleteLogic(ids); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//查询已经存在的明细，并删除部分需要删除的
|
|
|
|
//新增或修改操作
|
|
|
|
List<OperAccessTaskDetailEntity> existsDetails = detailService.list(new LambdaQueryWrapper<OperAccessTaskDetailEntity>() {{ |
|
|
|
Set<Long> existsIds = existsDetails.stream().map(OperAccessTaskDetailEntity::getId).collect(Collectors.toSet()); |
|
|
|
eq(OperAccessTaskDetailEntity::getTaskId, taskId); |
|
|
|
for (OperAccessTaskDetailDTO req : details) { |
|
|
|
eq(OperAccessTaskDetailEntity::getIsDeleted, 0L); |
|
|
|
req.setTaskId(taskId); |
|
|
|
}}); |
|
|
|
if (req.getId() == null) { |
|
|
|
Set<Long> detailIds = details.stream().filter(o -> o.getId() != null).map(OperAccessTaskDetailDTO::getId).collect(Collectors.toSet()); |
|
|
|
detailService.doSave(req); |
|
|
|
List<Long> ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessTaskDetailEntity::getId).collect(Collectors.toList()); |
|
|
|
} else if (req.getId() != null && existsIds.contains(req.getId())) { |
|
|
|
if (!CollectionUtils.isEmpty(ids)) { |
|
|
|
detailService.updateById(req); |
|
|
|
detailService.deleteLogic(ids); |
|
|
|
} else { |
|
|
|
} |
|
|
|
detailService.doSave(req); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//新增或修改操作
|
|
|
|
/** |
|
|
|
Set<Long> existsIds = existsDetails.stream().map(OperAccessTaskDetailEntity::getId).collect(Collectors.toSet()); |
|
|
|
* 调整检修材料 |
|
|
|
for (OperAccessTaskDetailDTO req : details) { |
|
|
|
* |
|
|
|
req.setTaskId(taskId); |
|
|
|
* @author xiashandong |
|
|
|
if (req.getId() == null) { |
|
|
|
**/ |
|
|
|
detailService.doSave(req); |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
} else if (req.getId() != null && existsIds.contains(req.getId())) { |
|
|
|
public void updateMaterials(long planId, long taskId, List<OperAccessMaterialDTO> materials) { |
|
|
|
detailService.updateById(req); |
|
|
|
if (CollectionUtils.isEmpty(materials)) { |
|
|
|
} else { |
|
|
|
materials = new ArrayList<>(); |
|
|
|
detailService.doSave(req); |
|
|
|
} |
|
|
|
} |
|
|
|
//查询已经存在的检修库明细，并删除部分需要删除的
|
|
|
|
} |
|
|
|
List<OperAccessMaterialEntity> existsDetails = materialService.list(new LambdaQueryWrapper<OperAccessMaterialEntity>() {{ |
|
|
|
} |
|
|
|
eq(OperAccessMaterialEntity::getPlanId, planId); |
|
|
|
|
|
|
|
eq(OperAccessMaterialEntity::getTaskId, taskId); |
|
|
|
|
|
|
|
eq(OperAccessMaterialEntity::getIsDeleted, 0L); |
|
|
|
|
|
|
|
}}); |
|
|
|
|
|
|
|
Set<Long> detailIds = materials.stream().filter(o -> o.getId() != null).map(OperAccessMaterialDTO::getId).collect(Collectors.toSet()); |
|
|
|
|
|
|
|
List<Long> ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessMaterialEntity::getId).collect(Collectors.toList()); |
|
|
|
|
|
|
|
if (!CollectionUtils.isEmpty(ids)) { |
|
|
|
|
|
|
|
materialService.deleteLogic(ids); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (CollectionUtil.isNotEmpty(materials)) { |
|
|
|
|
|
|
|
List<OperAccessMaterialEntity> materialEntityList = JSONArray.parseArray(JSON.toJSONString(materials), OperAccessMaterialEntity.class); |
|
|
|
|
|
|
|
materialService.saveOrUpdateBatch(materialEntityList); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 调整检修材料 |
|
|
|
* 执行检修任务 |
|
|
|
* |
|
|
|
* |
|
|
|
* @author xiashandong |
|
|
|
* @param accessTaskDTO |
|
|
|
**/ |
|
|
|
* @return |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
*/ |
|
|
|
public void updateMaterials(long planId,long taskId, List<OperAccessMaterialDTO> materials) { |
|
|
|
@Override |
|
|
|
if (CollectionUtils.isEmpty(materials)) { |
|
|
|
public R finishAccessTask(OperAccessTaskDTO accessTaskDTO) { |
|
|
|
materials = new ArrayList<>(); |
|
|
|
OperAccessTaskEntity taskEntity = getById(accessTaskDTO.getId()); |
|
|
|
} |
|
|
|
//TODO 更新任务状态以及 填入数据（待确认）
|
|
|
|
//查询已经存在的检修库明细，并删除部分需要删除的
|
|
|
|
taskEntity.setStatus(AccessConstants.ACCESS_TASK_STATUS_2); |
|
|
|
List<OperAccessMaterialEntity> existsDetails = materialService.list(new LambdaQueryWrapper<OperAccessMaterialEntity>() {{ |
|
|
|
taskEntity.setActHours(accessTaskDTO.getActHours()); |
|
|
|
eq(OperAccessMaterialEntity::getPlanId, planId); |
|
|
|
if (updateById(taskEntity)) { |
|
|
|
eq(OperAccessMaterialEntity::getTaskId, taskId); |
|
|
|
//更新材料
|
|
|
|
eq(OperAccessMaterialEntity::getIsDeleted, 0L); |
|
|
|
updateMaterials(taskEntity.getPlanId(), taskEntity.getId(), accessTaskDTO.getAccessMaterials()); |
|
|
|
}}); |
|
|
|
//终结工作流
|
|
|
|
Set<Long> detailIds = materials.stream().filter(o -> o.getId() != null).map(OperAccessMaterialDTO::getId).collect(Collectors.toSet()); |
|
|
|
ComleteTask comleteTask = new ComleteTask(); |
|
|
|
List<Long> ids = existsDetails.stream().filter(o -> !detailIds.contains(o.getId())).map(OperAccessMaterialEntity::getId).collect(Collectors.toList()); |
|
|
|
comleteTask.setProcessInstanceId(taskEntity.getProcessInstanceId()); |
|
|
|
if (!CollectionUtils.isEmpty(ids)) { |
|
|
|
comleteTask.setFlag("ok"); |
|
|
|
materialService.deleteLogic(ids); |
|
|
|
comleteTask.setPass(true); |
|
|
|
} |
|
|
|
comleteTask.setComment("执行任务完成，进行下一步流程"); |
|
|
|
if(CollectionUtil.isNotEmpty(materials)){ |
|
|
|
this.completeTask(comleteTask, AuthUtil.getUserId(), taskEntity.getProcessInstanceId(), taskEntity.getCreateDept()); |
|
|
|
List<OperAccessMaterialEntity> materialEntityList = JSONArray.parseArray(JSON.toJSONString(materials),OperAccessMaterialEntity.class); |
|
|
|
} |
|
|
|
materialService.saveOrUpdateBatch(materialEntityList); |
|
|
|
return R.success("操作成功"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 执行检修任务 |
|
|
|
* 获取安全检查定期检修项统计 |
|
|
|
* @param accessTaskDTO |
|
|
|
* |
|
|
|
* @return |
|
|
|
* @param startDate 开始时间 |
|
|
|
*/ |
|
|
|
* @param endDate 结束时间 |
|
|
|
@Override |
|
|
|
* @param dept 机构ID |
|
|
|
public R finishAccessTask(OperAccessTaskDTO accessTaskDTO) { |
|
|
|
* @return SafeCheckStatisticVO对象 |
|
|
|
OperAccessTaskEntity taskEntity = getById(accessTaskDTO.getId()); |
|
|
|
*/ |
|
|
|
//TODO 更新任务状态以及 填入数据（待确认）
|
|
|
|
@Override |
|
|
|
taskEntity.setStatus(AccessConstants.ACCESS_TASK_STATUS_2); |
|
|
|
public SafeCheckStatisticVO getAccessTaskCheck(String startDate, String endDate, Long dept) { |
|
|
|
taskEntity.setActHours(accessTaskDTO.getActHours()); |
|
|
|
SafeCheckStatisticVO vo = new SafeCheckStatisticVO(); |
|
|
|
if(updateById(taskEntity)) { |
|
|
|
List<OperAccessTaskEntity> taskEntityList = this.list(Wrappers.<OperAccessTaskEntity>lambdaQuery().eq(OperAccessTaskEntity::getStatus, AccessConstants.ACCESS_TASK_STATUS_4).ge(OperAccessTaskEntity::getCreateTime, startDate).le(OperAccessTaskEntity::getCreateTime, endDate).eq(OperAccessTaskEntity::getCreateDept, dept)); |
|
|
|
//更新材料
|
|
|
|
vo.setProjectType(Constants.SafeCheckProjectEnum.ACCESS_TASK.getType()); |
|
|
|
updateMaterials(taskEntity.getPlanId(), taskEntity.getId(), accessTaskDTO.getAccessMaterials()); |
|
|
|
vo.setProjectTypeName(Constants.SafeCheckProjectEnum.ACCESS_TASK.getName()); |
|
|
|
//终结工作流
|
|
|
|
vo.setTotal(taskEntityList.size()); |
|
|
|
ComleteTask comleteTask = new ComleteTask(); |
|
|
|
return vo; |
|
|
|
comleteTask.setProcessInstanceId(taskEntity.getProcessInstanceId()); |
|
|
|
} |
|
|
|
comleteTask.setFlag("ok"); |
|
|
|
|
|
|
|
comleteTask.setPass(true); |
|
|
|
|
|
|
|
comleteTask.setComment("执行任务完成，进行下一步流程"); |
|
|
|
|
|
|
|
this.completeTask(comleteTask,AuthUtil.getUserId(),taskEntity.getProcessInstanceId(),taskEntity.getCreateDept()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return R.success("操作成功"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 获取安全检查定期检修项统计 |
|
|
|
* 根据区域和月份分页查询检修任务 |
|
|
|
* @param startDate 开始时间 |
|
|
|
* |
|
|
|
* @param endDate 结束时间 |
|
|
|
* @param dbPage |
|
|
|
* @param dept 机构ID |
|
|
|
* @param result |
|
|
|
* @return SafeCheckStatisticVO对象 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public IPage<OperAccessTaskEntity> selectPage(Page<OperAccessTaskEntity> dbPage, OperAccessTaskEntity result) { |
|
|
|
public SafeCheckStatisticVO getAccessTaskCheck(String startDate, String endDate, Long dept) { |
|
|
|
QueryWrapper<OperAccessTaskEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
SafeCheckStatisticVO vo = new SafeCheckStatisticVO(); |
|
|
|
//区域
|
|
|
|
List<OperAccessTaskEntity> taskEntityList = this.list(Wrappers.<OperAccessTaskEntity>lambdaQuery() |
|
|
|
queryWrapper.eq(StringUtils.isNotBlank(result.getAreaId()), "CREATE_DEPT", result.getAreaId()); |
|
|
|
.eq(OperAccessTaskEntity::getStatus,AccessConstants.ACCESS_TASK_STATUS_4) |
|
|
|
//月份
|
|
|
|
.ge(OperAccessTaskEntity::getCreateTime,startDate) |
|
|
|
queryWrapper.eq(result.getYearMonth() != null, "date_format(PLAN_START_TIME, '%Y-%m')", result.getYearMonth()); |
|
|
|
.le(OperAccessTaskEntity::getCreateTime,endDate) |
|
|
|
//任务名称
|
|
|
|
.eq(OperAccessTaskEntity::getCreateDept,dept) |
|
|
|
queryWrapper.eq(StringUtils.isNotBlank(result.getName()), "name", result.getName()); |
|
|
|
); |
|
|
|
//状态
|
|
|
|
vo.setProjectType(Constants.SafeCheckProjectEnum.ACCESS_TASK.getType()); |
|
|
|
queryWrapper.eq(result.getStatus() != null, "STATUS", result.getStatus()); |
|
|
|
vo.setProjectTypeName(Constants.SafeCheckProjectEnum.ACCESS_TASK.getName()); |
|
|
|
|
|
|
|
vo.setTotal(taskEntityList.size()); |
|
|
|
|
|
|
|
return vo; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*** |
|
|
|
return baseMapper.selectPage(dbPage, queryWrapper); |
|
|
|
* 根据流程ID和处理人完成任务 |
|
|
|
} |
|
|
|
* @param comleteTask |
|
|
|
|
|
|
|
* @param handler |
|
|
|
|
|
|
|
* @param processInstanceId |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
private void completeTask(ComleteTask comleteTask, Long handler, String processInstanceId, Long deptId) { |
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(handler)){ |
|
|
|
|
|
|
|
String taskUser = StringUtil.format("{}_{}",new String[]{"taskUser",String.valueOf(handler)}); |
|
|
|
|
|
|
|
R<BladeFlow> bladeFlowR = flowClient.getTaskByProcessInstanceIdAndUserId(processInstanceId,taskUser); |
|
|
|
|
|
|
|
if(!bladeFlowR.isSuccess() || ObjectUtil.isEmpty(bladeFlowR.getData())){ |
|
|
|
|
|
|
|
throw new ServiceException("获取检修任务工作流任务失败"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//若成功则封装CompleteTask 执行任务
|
|
|
|
|
|
|
|
comleteTask.setProcessInstanceId(processInstanceId); |
|
|
|
|
|
|
|
comleteTask.setTaskId(bladeFlowR.getData().getTaskId()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//获取检修任务审批人角色下的审批人列表
|
|
|
|
|
|
|
|
R<List<User>> userListR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), deptId, AccessConstants.TASK_REVIEWER); |
|
|
|
|
|
|
|
if(!userListR.isSuccess()){ |
|
|
|
|
|
|
|
throw new ServiceException(userListR.getMsg()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(userListR.getData())) { |
|
|
|
|
|
|
|
String reviewer = userListR.getData().stream().map(user->StringUtil.format("{}_{}","taskUser",String.valueOf(user.getId()))) |
|
|
|
|
|
|
|
.collect(Collectors.joining(",")); |
|
|
|
|
|
|
|
Map<String,Object> variables = new HashMap<>(1); |
|
|
|
|
|
|
|
variables.put("reviewer",reviewer); |
|
|
|
|
|
|
|
comleteTask.setVariables(variables); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
R result = flowClient.completeTask(comleteTask); |
|
|
|
/*** |
|
|
|
if(!result.isSuccess()){ |
|
|
|
* 根据流程ID和处理人完成任务 |
|
|
|
throw new ServiceException(result.getMsg()); |
|
|
|
* @param comleteTask |
|
|
|
} |
|
|
|
* @param handler |
|
|
|
} |
|
|
|
* @param processInstanceId |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
private void completeTask(ComleteTask comleteTask, Long handler, String processInstanceId, Long deptId) { |
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(handler)) { |
|
|
|
|
|
|
|
String taskUser = StringUtil.format("{}_{}", new String[]{"taskUser", String.valueOf(handler)}); |
|
|
|
|
|
|
|
R<BladeFlow> bladeFlowR = flowClient.getTaskByProcessInstanceIdAndUserId(processInstanceId, taskUser); |
|
|
|
|
|
|
|
if (!bladeFlowR.isSuccess() || ObjectUtil.isEmpty(bladeFlowR.getData())) { |
|
|
|
|
|
|
|
throw new ServiceException("获取检修任务工作流任务失败"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//若成功则封装CompleteTask 执行任务
|
|
|
|
|
|
|
|
comleteTask.setProcessInstanceId(processInstanceId); |
|
|
|
|
|
|
|
comleteTask.setTaskId(bladeFlowR.getData().getTaskId()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//获取检修任务审批人角色下的审批人列表
|
|
|
|
|
|
|
|
R<List<User>> userListR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), deptId, AccessConstants.TASK_REVIEWER); |
|
|
|
|
|
|
|
if (!userListR.isSuccess()) { |
|
|
|
|
|
|
|
throw new ServiceException(userListR.getMsg()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(userListR.getData())) { |
|
|
|
|
|
|
|
String reviewer = userListR.getData().stream().map(user -> StringUtil.format("{}_{}", "taskUser", String.valueOf(user.getId()))).collect(Collectors.joining(",")); |
|
|
|
|
|
|
|
Map<String, Object> variables = new HashMap<>(1); |
|
|
|
|
|
|
|
variables.put("reviewer", reviewer); |
|
|
|
|
|
|
|
comleteTask.setVariables(variables); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
R result = flowClient.completeTask(comleteTask); |
|
|
|
* 根据检修任务完成缺陷处理流程 |
|
|
|
if (!result.isSuccess()) { |
|
|
|
* @param accessTaskEntity |
|
|
|
throw new ServiceException(result.getMsg()); |
|
|
|
*/ |
|
|
|
} |
|
|
|
private void finishDefectFlow(OperAccessTaskEntity accessTaskEntity) { |
|
|
|
} |
|
|
|
if(Func.isNotEmpty(accessTaskEntity.getPhenomenonId())) { |
|
|
|
|
|
|
|
OperPhenomenonEntity operPhenomenonEntity = operPhenomenonMapper.selectById(accessTaskEntity.getPhenomenonId()); |
|
|
|
|
|
|
|
operPhenomenonEntity.setHandleStatus(RepairConstant.CONCLUSION_PROBLEM); |
|
|
|
|
|
|
|
//operPhenomenonEntity.setCheckHours(accessTaskEntity.getActHours());
|
|
|
|
|
|
|
|
operPhenomenonMapper.updateById(operPhenomenonEntity); |
|
|
|
|
|
|
|
String processInstanceId = operPhenomenonEntity.getCheckProcessInstanceId(); |
|
|
|
|
|
|
|
//获取缺陷
|
|
|
|
|
|
|
|
OperDefectEntity operDefectEntity = defectService.getOne(Wrappers.<OperDefectEntity>lambdaQuery() |
|
|
|
|
|
|
|
.eq(OperDefectEntity::getDefectCode, operPhenomenonEntity.getDefectCode()) |
|
|
|
|
|
|
|
.last("limit 1;") |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
if(ObjectUtil.isNotEmpty(operDefectEntity)) { |
|
|
|
|
|
|
|
operDefectEntity.setActEndTime(new Date()); |
|
|
|
|
|
|
|
operDefectEntity.setActHours(ObjectUtil.isNotEmpty(accessTaskEntity.getActHours()) ? accessTaskEntity.getActHours().toString() : null); |
|
|
|
|
|
|
|
operDefectEntity.setHandleStatus(RepairConstant.CONCLUSION_PROBLEM); |
|
|
|
|
|
|
|
operDefectEntity.setDisposeDesc(accessTaskEntity.getDescripiton()); |
|
|
|
|
|
|
|
defectService.updateById(operDefectEntity); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ComleteTask comleteTask = new ComleteTask(); |
|
|
|
/** |
|
|
|
comleteTask.setProcessInstanceId(processInstanceId); |
|
|
|
* 根据检修任务完成缺陷处理流程 |
|
|
|
//获取当前环节taskId
|
|
|
|
* |
|
|
|
R<BladeFlow> bladeFlowR = flowClient.getTaskByProcessInstanceIdAndUserId(processInstanceId, "taskUser_"+AuthUtil.getUserId()); |
|
|
|
* @param accessTaskEntity |
|
|
|
Assert.isTrue(bladeFlowR.isSuccess() && ObjectUtil.isNotEmpty(bladeFlowR.getData()),()->{ |
|
|
|
*/ |
|
|
|
throw new ServiceException("当前操作人获取消缺任务失败"); |
|
|
|
private void finishDefectFlow(OperAccessTaskEntity accessTaskEntity) { |
|
|
|
}); |
|
|
|
if (Func.isNotEmpty(accessTaskEntity.getPhenomenonId())) { |
|
|
|
comleteTask.setTaskId(bladeFlowR.getData().getTaskId()); |
|
|
|
OperPhenomenonEntity operPhenomenonEntity = operPhenomenonMapper.selectById(accessTaskEntity.getPhenomenonId()); |
|
|
|
comleteTask.setComment("审批通过工作流结束"); |
|
|
|
operPhenomenonEntity.setHandleStatus(RepairConstant.CONCLUSION_PROBLEM); |
|
|
|
comleteTask.setFlag("ok"); |
|
|
|
//operPhenomenonEntity.setCheckHours(accessTaskEntity.getActHours());
|
|
|
|
comleteTask.setPass(true); |
|
|
|
operPhenomenonMapper.updateById(operPhenomenonEntity); |
|
|
|
Map<String,Object> variables = new HashMap<>(1); |
|
|
|
String processInstanceId = operPhenomenonEntity.getCheckProcessInstanceId(); |
|
|
|
R<List<User>> listR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), operDefectEntity.getCreateDept(), DefectConstant.PROCESS_VARIABLE_CONCLUSION); |
|
|
|
//获取缺陷
|
|
|
|
Assert.isTrue(listR.isSuccess() && ObjectUtil.isNotEmpty(listR.getData()),()->{ |
|
|
|
OperDefectEntity operDefectEntity = defectService.getOne(Wrappers.<OperDefectEntity>lambdaQuery().eq(OperDefectEntity::getDefectCode, operPhenomenonEntity.getDefectCode()).last("limit 1;")); |
|
|
|
throw new ServiceException("获取问题定论人失败"); |
|
|
|
if (ObjectUtil.isNotEmpty(operDefectEntity)) { |
|
|
|
}); |
|
|
|
operDefectEntity.setActEndTime(new Date()); |
|
|
|
String conclusion = listR.getData().stream().map(user->"taskUser_"+user.getId()).collect(Collectors.joining(",")); |
|
|
|
operDefectEntity.setActHours(ObjectUtil.isNotEmpty(accessTaskEntity.getActHours()) ? accessTaskEntity.getActHours().toString() : null); |
|
|
|
variables.put("conclusion",conclusion); |
|
|
|
operDefectEntity.setHandleStatus(RepairConstant.CONCLUSION_PROBLEM); |
|
|
|
comleteTask.setVariables(variables); |
|
|
|
operDefectEntity.setDisposeDesc(accessTaskEntity.getDescripiton()); |
|
|
|
flowClient.completeTask(comleteTask); |
|
|
|
defectService.updateById(operDefectEntity); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
ComleteTask comleteTask = new ComleteTask(); |
|
|
|
* 巡检任务生成后待办消息提示 |
|
|
|
comleteTask.setProcessInstanceId(processInstanceId); |
|
|
|
* @param req |
|
|
|
//获取当前环节taskId
|
|
|
|
*/ |
|
|
|
R<BladeFlow> bladeFlowR = flowClient.getTaskByProcessInstanceIdAndUserId(processInstanceId, "taskUser_" + AuthUtil.getUserId()); |
|
|
|
private void pushHandleMessage(OperAccessTaskDTO operAccessTaskDTO,PushExtrasReq req){ |
|
|
|
Assert.isTrue(bladeFlowR.isSuccess() && ObjectUtil.isNotEmpty(bladeFlowR.getData()), () -> { |
|
|
|
req.setTitle(AccessConstants.MESSAGE_TITLE); |
|
|
|
throw new ServiceException("当前操作人获取消缺任务失败"); |
|
|
|
req.setType(AccessConstants.MESSAGE_ACCESS_TYPE); |
|
|
|
}); |
|
|
|
req.setBusinessClassify(OperationalConstants.MessageClassifyEnum.MESSAGE_REMINDSY.getVal()); |
|
|
|
comleteTask.setTaskId(bladeFlowR.getData().getTaskId()); |
|
|
|
req.setPushAlert(AccessConstants.AccessProcessEnum.ACCESS_BACKLOG.getMsg()); |
|
|
|
comleteTask.setComment("审批通过工作流结束"); |
|
|
|
log.info("--------消息推送开始----------"); |
|
|
|
comleteTask.setFlag("ok"); |
|
|
|
messagePushClient.sendMessage(operAccessTaskDTO.getHandler().toString(), req,operAccessTaskDTO.getTenantId(),operAccessTaskDTO.getCreateDept(),operAccessTaskDTO.getCreateUser()); |
|
|
|
comleteTask.setPass(true); |
|
|
|
log.info("消息推送人为：{}，推送消息为：{}",operAccessTaskDTO.getHandler().toString(),AccessConstants.AccessProcessEnum.ACCESS_BACKLOG.getMsg()); |
|
|
|
Map<String, Object> variables = new HashMap<>(1); |
|
|
|
log.info("--------消息推送成功----------"); |
|
|
|
R<List<User>> listR = userClient.relationUserListByRoleAlias(AuthUtil.getTenantId(), operDefectEntity.getCreateDept(), DefectConstant.PROCESS_VARIABLE_CONCLUSION); |
|
|
|
} |
|
|
|
Assert.isTrue(listR.isSuccess() && ObjectUtil.isNotEmpty(listR.getData()), () -> { |
|
|
|
|
|
|
|
throw new ServiceException("获取问题定论人失败"); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
String conclusion = listR.getData().stream().map(user -> "taskUser_" + user.getId()).collect(Collectors.joining(",")); |
|
|
|
|
|
|
|
variables.put("conclusion", conclusion); |
|
|
|
|
|
|
|
comleteTask.setVariables(variables); |
|
|
|
|
|
|
|
flowClient.completeTask(comleteTask); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 巡检任务生成后待办消息提示 |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param req |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
private void pushHandleMessage(OperAccessTaskDTO operAccessTaskDTO, PushExtrasReq req) { |
|
|
|
|
|
|
|
req.setTitle(AccessConstants.MESSAGE_TITLE); |
|
|
|
|
|
|
|
req.setType(AccessConstants.MESSAGE_ACCESS_TYPE); |
|
|
|
|
|
|
|
req.setBusinessClassify(OperationalConstants.MessageClassifyEnum.MESSAGE_REMINDSY.getVal()); |
|
|
|
|
|
|
|
req.setPushAlert(AccessConstants.AccessProcessEnum.ACCESS_BACKLOG.getMsg()); |
|
|
|
|
|
|
|
log.info("--------消息推送开始----------"); |
|
|
|
|
|
|
|
messagePushClient.sendMessage(operAccessTaskDTO.getHandler().toString(), req, operAccessTaskDTO.getTenantId(), operAccessTaskDTO.getCreateDept(), operAccessTaskDTO.getCreateUser()); |
|
|
|
|
|
|
|
log.info("消息推送人为：{}，推送消息为：{}", operAccessTaskDTO.getHandler().toString(), AccessConstants.AccessProcessEnum.ACCESS_BACKLOG.getMsg()); |
|
|
|
|
|
|
|
log.info("--------消息推送成功----------"); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
段飞宇
2 years ago