From 48984da72dd03b6b0cce54433215abfc402a4ea5 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 16:58:07 +0800
Subject: [PATCH] art: 设备管理-点检工单-自动生成点检，点检过期未保养标记过期
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderGenerateJob.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 93 +++++++++------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java | 8 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java | 86 ++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java | 9 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java | 129 +++++++++++++++++++++
9 files changed, 297 insertions(+), 40 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
index 231ad89..42d5d10 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -11,6 +11,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.request.EamWeekMaintenanceQuery;
@@ -79,6 +80,7 @@
}
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.WEEK_MAINTENANCE_CODE_RULE);
request.setOrderNum(codeSeq);
+ request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
boolean b = eamWeekMaintenanceOrderService.addWeekMaintenance(request);
if (!b) {
return Result.error("娣诲姞澶辫触锛�");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
index 1759b3a..00962c2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrderDetail.java
@@ -75,4 +75,12 @@
@ApiModelProperty(value = "淇濆吇瑕佹眰")
private String itemDemand;
+ public EamInspectionOrderDetail(){}
+
+ public EamInspectionOrderDetail(EamMaintenanceStandardDetail detail) {
+ this.itemCode = detail.getItemCode();
+ this.itemName = detail.getItemName();
+ this.itemDemand = detail.getItemDemand();
+ }
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java
new file mode 100644
index 0000000..ffc9040
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java
@@ -0,0 +1,86 @@
+package org.jeecg.modules.eam.job;
+
+import cn.hutool.core.collection.CollectionUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.eam.constant.InspectionStatus;
+import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.mdc.util.ThrowableUtil;
+import org.jeecg.modules.quartz.entity.QuartzJob;
+import org.jeecg.modules.quartz.entity.SysQuartzLog;
+import org.jeecg.modules.quartz.service.IQuartzJobService;
+import org.jeecg.modules.quartz.service.ISysQuartzLogService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+
+@Component
+@Slf4j
+public class InspectionOrderExpiredJob implements Job {
+
+ @Autowired
+ private IEamInspectionOrderService eamInspectionOrderService;
+
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+ @Autowired
+ private ISysQuartzLogService sysQuartzLogService;
+ @Autowired
+ private IQuartzJobService quartzJobService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+ //浠诲姟鏃ュ織
+ SysQuartzLog quartzLog = new SysQuartzLog();
+ quartzLog.setCreateTime(new Date());
+ List<QuartzJob> byJobClassName = quartzJobService.findByJobClassName(this.getClass().getName());
+ if (byJobClassName != null && !byJobClassName.isEmpty()) {
+ quartzLog.setJobId(byJobClassName.get(0).getId());
+ }
+ long startTime = System.currentTimeMillis();
+ LocalDate now = LocalDate.now();
+ try {
+ List<EamInspectionOrder> unCompleteOrderList = eamInspectionOrderService.selectUnCompleteOrder(now.toString());
+ if (CollectionUtil.isEmpty(unCompleteOrderList)) {
+ //娌℃湁闇�瑕佸鐞嗙殑鏁版嵁
+ 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());
+ //寮哄埗缁撴潫娴佺▼ 鍒犻櫎鐢ㄦ埛鐨勬寰呭姙浠诲姟
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.selectByDataId(order.getId());
+ if (flowMyBusiness != null) {
+ flowTaskService.end(flowMyBusiness.getProcessInstanceId(), "杩囨湡鍒犻櫎");
+ }
+ }
+ }
+ eamInspectionOrderService.updateBatchById(unCompleteOrderList);
+ quartzLog.setIsSuccess(0);
+ } catch (Exception e) {
+ log.error("鐐规杩囨湡鎵ц瀹氭椂浠诲姟澶辫触锛寋}", e.getMessage(), e);
+ quartzLog.setIsSuccess(-1);
+ quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
+ }
+ long endTime = System.currentTimeMillis();
+ quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
+ sysQuartzLogService.save(quartzLog);
+ }
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java
new file mode 100644
index 0000000..00faa7e
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java
@@ -0,0 +1,129 @@
+package org.jeecg.modules.eam.job;
+
+import cn.hutool.core.collection.CollectionUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
+import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
+import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
+import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
+import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
+import org.jeecg.modules.mdc.util.ThrowableUtil;
+import org.jeecg.modules.quartz.entity.QuartzJob;
+import org.jeecg.modules.quartz.entity.SysQuartzLog;
+import org.jeecg.modules.quartz.service.IQuartzJobService;
+import org.jeecg.modules.quartz.service.ISysQuartzLogService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class InspectionOrderGenerateJob implements Job {
+ @Autowired
+ private IEamMaintenanceStandardService eamMaintenanceStandardService;
+ @Autowired
+ private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
+ @Autowired
+ private IEamInspectionOrderService eamInspectionOrderService;
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private ISysQuartzLogService sysQuartzLogService;
+ @Autowired
+ private IQuartzJobService quartzJobService;
+
+ /**
+ * 宸ュ崟鐢熸垚
+ *
+ * @param jobExecutionContext
+ * @throws JobExecutionException
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+ //浠诲姟鏃ュ織
+ SysQuartzLog quartzLog = new SysQuartzLog();
+ quartzLog.setCreateTime(new Date());
+ List<QuartzJob> byJobClassName = quartzJobService.findByJobClassName(this.getClass().getName());
+ if (byJobClassName != null && !byJobClassName.isEmpty()) {
+ quartzLog.setJobId(byJobClassName.get(0).getId());
+ }
+ long startTime = System.currentTimeMillis();
+ /**
+ * 鑾峰彇 閰嶇疆浜� 鍛ㄤ繚鏍囧噯鐨� 淇℃伅
+ */
+ List<EamMaintenanceStandard> standardList = eamMaintenanceStandardService.queryListByCategory(MaintenanceCategoryEnum.POINT_INSPECTION.name());
+ if (CollectionUtil.isEmpty(standardList)) {
+ log.warn("娌℃湁閰嶇疆浠讳綍鍛ㄤ繚鏍囧噯锛屼换鍔＄粨鏉�");
+ return;
+ }
+ //褰撳墠鏃ユ湡
+ LocalDate now = LocalDate.now();
+ try {
+ for (EamMaintenanceStandard standard : standardList) {
+ if (standard.getMaintenancePeriod() == null || standard.getMaintenancePeriod() < 1) {
+ log.error("鐐规鏍囧噯鍛ㄦ湡璁剧疆閿欒锛岃鍏堥厤缃爣鍑嗗懆鏈�, standard:{}", standard);
+ continue;
+ }
+ if (standard.getInitialDate() == null) {
+ //璁剧疆鍒濆鏃ユ湡涓哄墠涓�澶�
+ 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)) {
+ //杩樻湭鍒扮敓鎴愭棩鏈燂紝璺宠繃鎵ц
+ continue;
+ }
+ //鑾峰彇淇濆吇椤规槑缁�
+ List<EamMaintenanceStandardDetail> standardDetailList = eamMaintenanceStandardDetailService.selectByStandardId(standard.getId());
+ if(CollectionUtil.isEmpty(standardDetailList)) {
+ log.error("鐐规鏍囧噯娌℃湁淇濆吇鏄庣粏锛岃鍏堥厤缃繚鍏绘槑缁�, standard:{}", standard);
+ continue;
+ }
+ //寮�濮嬬敓鎴�
+ EamInspectionOrderRequest request = new EamInspectionOrderRequest();
+ request.setEquipmentId(standard.getEquipmentId());
+ request.setStandardId(standard.getId());
+ request.setInspectionDate(DateUtils.localDateToDate(generateDate));
+ request.setExpirationTime(DateUtils.localDateToDate(generateDate.plusDays(standard.getMaintenancePeriod())));
+ 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);
+ quartzLog.setIsSuccess(-1);
+ quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
+ }
+ long endTime = System.currentTimeMillis();
+ quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
+ sysQuartzLogService.save(quartzLog);
+ }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderGenerateJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderGenerateJob.java
index e676870..61e3a92 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderGenerateJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderGenerateJob.java
@@ -5,6 +5,7 @@
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
+import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
@@ -92,7 +93,7 @@
//鍒濆鏃ユ湡璁剧疆鐨勬瘮杈冩棭锛屾垨浠诲姟闀挎椂闂存病鎵ц锛屽繀椤诲懆鏈熷埌浠婂ぉ鎵嶄細鐢熸垚宸ュ崟
generateDate = generateDate.plusDays(standard.getMaintenancePeriod());
} while (now.isAfter(generateDate));
- if(now.compareTo(generateDate) != 0) {
+ if(!now.isEqual(generateDate)) {
//杩樻湭鍒扮敓鎴愭棩鏈燂紝璺宠繃鎵ц
continue;
}
@@ -109,6 +110,7 @@
request.setMaintenanceDate(DateUtils.localDateToDate(generateDate));
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.WEEK_MAINTENANCE_CODE_RULE);
request.setOrderNum(codeSeq);
+ request.setCreationMethod(OrderCreationMethodEnum.AUTO.name());
List<EamWeekMaintenanceOrderDetail> collect = standardDetailList.stream().map(EamWeekMaintenanceOrderDetail::new).collect(Collectors.toList());
request.setTableDetailList(collect);
eamWeekMaintenanceOrderService.addWeekMaintenance(request);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java
index 010eb5a..c2f7ecf 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamWeekMaintenanceRequest.java
@@ -7,6 +7,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.springframework.format.annotation.DateTimeFormat;
@@ -50,6 +51,9 @@
/**澶囨敞*/
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**鍒涘缓鏂瑰紡*/
+ @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ private String creationMethod;
/**鍒楄〃 淇濆吇椤规槑缁�*/
@ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
private List<EamWeekMaintenanceOrderDetail> tableDetailList;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
index 4aa4732..db9c878 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java
@@ -8,6 +8,8 @@
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
+import java.util.List;
+
/**
* @Description: 鐐规宸ュ崟
* @Author: jeecg-boot
@@ -73,4 +75,11 @@
* @return
*/
IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query);
+
+ /**
+ * 鑾峰彇鏈偣妫�鐨勫伐鍗�
+ * @param expiredDate 杩囨湡鏃ユ湡
+ * @return
+ */
+ List<EamInspectionOrder> selectUnCompleteOrder(String expiredDate);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 55fcc20..6a381ad 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,7 +24,6 @@
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
-import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
@@ -51,7 +51,7 @@
/**
* @Description: 鐐规宸ュ崟
* @Author: jeecg-boot
- * @Date: 2025-04-02
+ * @Date: 2025-04-02
* @Version: V1.0
*/
@Service("IEamInspectionOrderService")
@@ -132,19 +132,31 @@
}
@Override
+ public List<EamInspectionOrder> selectUnCompleteOrder(String expiredDate) {
+ LambdaQueryWrapper<EamInspectionOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.lt(EamInspectionOrder::getInspectionDate, expiredDate);
+ List<String> unCompleteStatus = new ArrayList<>();
+ unCompleteStatus.add(InspectionStatus.WAIT_INSPECTION.name());
+ unCompleteStatus.add(InspectionStatus.UNDER_INSPECTION.name());
+ queryWrapper.in(EamInspectionOrder::getInspectionStatus, unCompleteStatus);
+ queryWrapper.orderByAsc(EamInspectionOrder::getInspectionDate);
+ return eamInspectionOrderMapper.selectList(queryWrapper);
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
- BeanUtils.copyProperties(eamInspectionOrderRequest,eamInspectionOrder);
+ BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
//淇敼鐘舵��
- if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
+ if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
- }else {
+ } else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
}
save(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
- if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
+ if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
tableDetail.setOrderId(eamInspectionOrder.getId());
tableDetail.setId(null);
@@ -152,7 +164,7 @@
eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
}
//澶勭悊闄勪欢
- if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
+ if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
FileUploadResult fileUploadResult = eamInspectionOrderRequest.getFileList().get(0);
ObjectMapper mapper = new ObjectMapper();
try {
@@ -162,7 +174,7 @@
log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
}
}
- if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
+ if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
triggerProcess(eamInspectionOrder);
}
return true;
@@ -170,6 +182,7 @@
/**
* 瑙﹀彂娴佺▼
+ *
* @param eamInspectionOrder
* @return
*/
@@ -177,26 +190,26 @@
EamEquipment equipment = eamEquipmentService.getById(eamInspectionOrder.getEquipmentId());
if (equipment == null) {
return false;
- }else {
+ } else {
eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
}
System.out.println("璁惧鐐规锛�" + eamInspectionOrder.getId());
- flowCommonService.initActBusiness("宸ュ崟鍙凤細"+eamInspectionOrder.getOrderNum()+"璁惧缂栧彿"+eamInspectionOrder.getEquipmentCode()+"杩涜璁惧鐐规",
+ flowCommonService.initActBusiness("宸ュ崟鍙凤細" + eamInspectionOrder.getOrderNum() + "璁惧缂栧彿" + eamInspectionOrder.getEquipmentCode() + "杩涜璁惧鐐规",
eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", eamInspectionOrder.getId());
- if (StrUtil.isEmpty(eamInspectionOrder.getRemark())){
+ if (StrUtil.isEmpty(eamInspectionOrder.getRemark())) {
variables.put("organization", "鏂板鐐规宸ュ崟榛樿鍚姩娴佺▼");
variables.put("comment", "鏂板鐐规宸ュ崟榛樿鍚姩娴佺▼");
- }else {
+ } else {
variables.put("organization", eamInspectionOrder.getRemark());
variables.put("comment", eamInspectionOrder.getRemark());
}
- variables.put("proofreading",true);
- List<String> usernames=new ArrayList<>();
+ variables.put("proofreading", true);
+ List<String> usernames = new ArrayList<>();
usernames.add(eamInspectionOrder.getOperator());
variables.put("NextAssignee", usernames);
- Result result= flowDefinitionService.startProcessInstanceByKey("eam_inspection", variables);
+ Result result = flowDefinitionService.startProcessInstanceByKey("eam_inspection", variables);
return result.isSuccess();
}
@@ -205,7 +218,7 @@
public boolean editInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
- if (StrUtil.isNotEmpty(eamInspectionOrder.getOperator())){
+ if (StrUtil.isNotEmpty(eamInspectionOrder.getOperator())) {
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
}
super.updateById(eamInspectionOrder);
@@ -224,16 +237,17 @@
/**
* 棰嗗彇鐐规宸ュ崟
+ *
* @param id
* @return
*/
@Override
- public boolean takeInspectionOrder(String id){
+ public boolean takeInspectionOrder(String id) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- EamInspectionOrder eamInspectionOrder=this.getById(id);
- if (eamInspectionOrder==null) {
+ EamInspectionOrder eamInspectionOrder = this.getById(id);
+ if (eamInspectionOrder == null) {
return false;
- }else {
+ } else {
eamInspectionOrder.setOperator(user.getUsername());
//淇敼鐘舵��
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
@@ -245,15 +259,16 @@
/**
* 浣滃簾鐐规宸ュ崟
+ *
* @param id
* @return
*/
@Override
- public boolean cancelInspectionOrder(String id){
+ public boolean cancelInspectionOrder(String id) {
EamInspectionOrder eamInspectionOrder = this.getById(id);
if (eamInspectionOrder == null) {
return false;
- }else {
+ } else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.ABOLISH.name());
return updateById(eamInspectionOrder);
}
@@ -261,6 +276,7 @@
/**
* 鐐规娴佺▼
+ *
* @param eamInspectionOrderRequest
* @return
*/
@@ -314,7 +330,7 @@
updateEamInspectionOrder(eamInspectionOrder);
//鏌ヨ鏁版嵁,杩涜璁惧缁翠慨澶勭悊
- if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())){
+ if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())) {
updateEamInspectionOrderDetail(eamInspectionOrder);
}
@@ -323,7 +339,6 @@
return Result.error("鎿嶄綔澶辫触锛�" + e.getMessage());
}
}
-
private boolean isValidRequest(EamInspectionOrderRequest request) {
@@ -438,40 +453,42 @@
/**
* 璁惧鏄惁瀛樺湪寮傚父,骞惰繘琛岃澶囩淮淇�
+ *
* @param eamInspectionOrder
*/
private void updateEamInspectionOrderDetail(EamInspectionOrder eamInspectionOrder) {
List<EamInspectionOrderDetail> eamInspectionOrderDetails = eamInspectionOrderDetailService
.list(new QueryWrapper<EamInspectionOrderDetail>()
- .eq("order_id", eamInspectionOrder.getId()).eq("report_flag","1").eq("inspection_result", "2"));
+ .eq("order_id", eamInspectionOrder.getId()).eq("report_flag", "1").eq("inspection_result", "2"));
eamReportRepairService.reportRepairFromInspection(eamInspectionOrder.getEquipmentId(), eamInspectionOrder.getOperator(), eamInspectionOrderDetails);
}
/**
* 鎵归噺浣滃簾涓庨鍙�
+ *
* @param ids
* @param type
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result<?> batchCancelOrTakeInspectionOrder(String ids, String type){
+ public Result<?> batchCancelOrTakeInspectionOrder(String ids, String type) {
if (type == null) {
return Result.error("璇烽�夋嫨鎿嶄綔绫诲瀷");
}
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<String> list = Arrays.asList(ids.split(","));
- QueryWrapper<EamInspectionOrder> queryWrapper =new QueryWrapper<>();
+ QueryWrapper<EamInspectionOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.in("id", list);
queryWrapper.eq("inspection_status", InspectionStatus.WAIT_INSPECTION.name());
- List<EamInspectionOrder> eamInspectionOrderList =this.list(queryWrapper);
- if (!eamInspectionOrderList.isEmpty()){
+ List<EamInspectionOrder> eamInspectionOrderList = this.list(queryWrapper);
+ if (!eamInspectionOrderList.isEmpty()) {
eamInspectionOrderList.forEach(eamInspectionOrder -> {
eamInspectionOrder.setInspectionStatus(type);
- if (InspectionStatus.UNDER_INSPECTION.name().equals(type)){
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(type)) {
eamInspectionOrder.setOperator(loginUser.getUsername());
this.triggerProcess(eamInspectionOrder);
- }else {
+ } else {
eamInspectionOrder.setOperator(null);
}
});
@@ -482,13 +499,13 @@
@Override
- public Result<?> selectVoById(String id){
- List<EamInspectionOrder> eamInspectionOrders=this.list(new QueryWrapper<EamInspectionOrder>().eq("id", id));
- List<EamInspectionOrderRequest> eamInspectionOrderRequestList=new ArrayList<>();
+ public Result<?> selectVoById(String id) {
+ List<EamInspectionOrder> eamInspectionOrders = this.list(new QueryWrapper<EamInspectionOrder>().eq("id", id));
+ List<EamInspectionOrderRequest> eamInspectionOrderRequestList = new ArrayList<>();
eamInspectionOrders.forEach(eamInspectionOrder -> {
- EamInspectionOrderRequest eamInspectionOrderRequest=new EamInspectionOrderRequest();
- BeanUtils.copyProperties(eamInspectionOrder,eamInspectionOrderRequest);
- List<EamInspectionOrderDetail> eamInspectionOrderDetails=eamInspectionOrderDetailService
+ EamInspectionOrderRequest eamInspectionOrderRequest = new EamInspectionOrderRequest();
+ BeanUtils.copyProperties(eamInspectionOrder, eamInspectionOrderRequest);
+ List<EamInspectionOrderDetail> eamInspectionOrderDetails = eamInspectionOrderDetailService
.list(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
eamInspectionOrderRequest.setTableDetailList(eamInspectionOrderDetails);
eamInspectionOrderRequestList.add(eamInspectionOrderRequest);
@@ -517,7 +534,7 @@
public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
//涓氬姟鏄惁骞查娴佺▼锛屼笟鍔″共棰勶紝娴佺▼骞查锛屾寚瀹氫汉鍛樿繘琛屽鐞�
//鑾峰彇涓嬩竴姝ュ鐞嗕汉
- Object object=values.get("NextAssignee");
+ Object object = values.get("NextAssignee");
return (List<String>) object;
}
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index 3b16ddb..8c41f9a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -95,7 +95,7 @@
order.setRemark(request.getRemark());
//鐘舵�佸垵濮嬪寲
order.setMaintenanceStatus(WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
- order.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+ order.setCreationMethod(request.getCreationMethod());
//鍒犻櫎鏍囪
order.setDelFlag(CommonConstant.DEL_FLAG_0);
eamWeekMaintenanceOrderMapper.insert(order);
--
Gitblit v1.9.3