lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -108,8 +108,7 @@ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE); eamInspectionOrderRequest.setOrderNum(codeSeq); eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL)); eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest); return Result.OK("添加成功！"); return eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest); } /** lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java
@@ -59,11 +59,8 @@ return; } for (EamInspectionOrder order : unCompleteOrderList) { if (InspectionStatus.WAIT_INSPECTION.name().equals(order.getInspectionStatus())) { order.setInspectionStatus(InspectionStatus.EXPIRED.name()); } else if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus())) { //已经被接单 但未执行完成 order.setInspectionStatus(InspectionStatus.EXPIRED.name()); order.setInspectionStatus(InspectionStatus.EXPIRED.name()); if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus())) { //强制结束流程 删除用户的此待办任务 FlowMyBusiness flowMyBusiness = flowMyBusinessService.selectByDataId(order.getId()); if (flowMyBusiness != null) { lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java
@@ -69,7 +69,7 @@ */ List<EamMaintenanceStandard> standardList = eamMaintenanceStandardService.queryListByCategory(MaintenanceCategoryEnum.POINT_INSPECTION.name()); if (CollectionUtil.isEmpty(standardList)) { log.warn("没有配置任何周保标准，任务结束"); log.warn("没有配置任何点检标准，任务结束"); return; } //当前日期 @@ -85,21 +85,18 @@ standard.setInitialDate(DateUtils.localDateToDate(now.minusDays(1))); } LocalDate generateDate = DateUtils.dateToLocalDate(standard.getInitialDate()); // if (standard.getLastGenerateTime() != null) { // generateDate = DateUtils.dateToLocalDate(standard.getLastGenerateTime()); // } //加周期 do { //初始日期设置的比较早，或任务长时间没执行，必须周期到今天才会生成工单 generateDate = generateDate.plusDays(standard.getMaintenancePeriod()); } while (now.isAfter(generateDate)); if(!now.isEqual(generateDate)) { if (!now.isEqual(generateDate)) { //还未到生成日期，跳过执行 continue; } //获取保养项明细 List<EamMaintenanceStandardDetail> standardDetailList = eamMaintenanceStandardDetailService.selectByStandardId(standard.getId()); if(CollectionUtil.isEmpty(standardDetailList)) { if (CollectionUtil.isEmpty(standardDetailList)) { log.error("点检标准没有保养明细，请先配置保养明细, standard:{}", standard); continue; } @@ -112,13 +109,11 @@ request.setCreationMethod(OrderCreationMethodEnum.AUTO.name()); String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE); request.setOrderNum(codeSeq); List<EamInspectionOrderDetail> collect = standardDetailList.stream().map(EamInspectionOrderDetail::new).collect(Collectors.toList()); request.setTableDetailList(collect); eamInspectionOrderService.addInspectionOrder(request); } quartzLog.setIsSuccess(0); } catch (Exception e) { log.error("周保过生成执行定时任务失败，{}", e.getMessage(), e); log.error("点检生成执行定时任务失败，{}", e.getMessage(), e); quartzLog.setIsSuccess(-1); quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e)); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -27,7 +27,7 @@ * @param eamInspectionOrderRequest * @return */ boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest); Result<String> addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest); /** * 编辑点检工单 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -156,15 +156,15 @@ @Override @Transactional(rollbackFor = Exception.class) public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) { public Result<String> addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) { List<EamInspectionOrder> eamInspectionOrders = eamInspectionOrderMapper.selectList(new LambdaQueryWrapper<EamInspectionOrder>().eq(EamInspectionOrder::getStandardId, eamInspectionOrderRequest.getStandardId()).eq(EamInspectionOrder::getInspectionDate, eamInspectionOrderRequest.getInspectionDate()).ne(EamInspectionOrder::getInspectionStatus, InspectionStatus.ABOLISH.name())); if (CollectionUtils.isNotEmpty(eamInspectionOrders)) { return Result.error("添加失败,系统已存在当前日期工单！"); } EamInspectionOrder eamInspectionOrder = new EamInspectionOrder(); BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder); //修改状态 if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) { eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name()); } else { eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name()); } eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name()); eamInspectionOrder.setDelFlag(CommonConstant.DEL_FLAG_0); save(eamInspectionOrder); //处理日点检明细数据 @@ -199,11 +199,7 @@ } } } // if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) { // triggerProcess(eamInspectionOrder); // } return true; return Result.OK("添加成功！"); } /** lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -327,7 +327,7 @@ LambdaQueryWrapper<EamMaintenanceStandard> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(EamMaintenanceStandard::getDelFlag, CommonConstant.DEL_FLAG_0); queryWrapper.eq(EamMaintenanceStandard::getMaintenanceCategory, maintenanceCategory); queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.WAIT_SUBMIT.name()); queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.START.name()); return eamMaintenanceStandardMapper.selectList(queryWrapper); }
