From 097313810e7f44078a5244f794e945269a665d72 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 12 七月 2025 09:33:05 +0800
Subject: [PATCH] 二保基础代码
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 104 +++--------------
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java | 115 ++++++++++++++----
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java | 90 ++++++---------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml | 4
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java | 33 ++---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 2
8 files changed, 162 insertions(+), 194 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
index eb55e54..26b729f 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java
@@ -106,7 +106,7 @@
log.setEquipmentId(order.getEquipmentId());
log.setBusinessId(order.getId());
log.setOperator(order.getOperator());
- log.setDescription(order.getConfirmComment());
+ log.setDescription(order.getInspectConfirmComment());
log.setCreateTime(order.getActualEndTime());
}
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index 344c9bf..97be295 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -120,7 +120,7 @@
*/
@Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4")
@ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
- @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "factory_code")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
private String factoryOrgCode;
/**
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
index 635a7d9..762c118 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
@@ -78,7 +78,7 @@
*/
@Excel(name = "鏍囧噯ID", width = 15)
@ApiModelProperty(value = "鏍囧噯ID")
- @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
+ @Dict(dictTable = "eam_maintenance_standard", dicCode = "id", dicText = "standard_name")
private String standardId;
/**
* 璁″垝淇濆吇鏃ユ湡
@@ -101,15 +101,14 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date actualEndTime;
+ /** 鎿嶄綔宸� */
+ @ApiModelProperty(value = "鎿嶄綔宸�")
+ private String operator ;
+ /** 缁翠慨宸� */
+ @ApiModelProperty(value = "缁翠慨宸�")
+ private String repairman ;
/**
- * 淇濆吇浜�
- */
- @Excel(name = "淇濆吇浜�", width = 15)
- @ApiModelProperty(value = "淇濆吇浜�")
- @Dict(dicCode = "sys_user, realname, username")
- private String operator;
- /**
- * 淇濆吇鐘舵��
+ * 淇濆吇鐘舵�� 寰呬繚鍏汇�佷繚鍏讳腑銆佺鐞嗗憳纭銆佹鏌ヤ汉纭銆佸凡瀹屾垚
*/
@Excel(name = "淇濆吇鐘舵��", width = 15)
@ApiModelProperty(value = "淇濆吇鐘舵��")
@@ -123,55 +122,35 @@
@Dict(dicCode = "order_creation_method")
private String creationMethod;
/**
- * 缁翠慨缁勯暱纭
+ * 绠＄悊鍛樼‘璁�
*/
- @Excel(name = "缁翠慨缁勯暱纭", width = 15)
- @ApiModelProperty(value = "缁翠慨缁勯暱纭")
+ @Excel(name = "绠＄悊鍛樼‘璁�", width = 15)
+ @ApiModelProperty(value = "绠＄悊鍛樼‘璁�")
@Dict(dicCode = "sys_user, realname, username")
- private String confirmUser;
- /**
- * 纭鎰忚
- */
- @ApiModelProperty(value = "纭鎰忚")
- private String confirmComment;
-
- /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
- @ApiModelProperty(value = "纭绫诲瀷")
- @Dict(dicCode = "approved_rejected")
- private String confirmDealType;
- /**
- * 纭鏃堕棿
- */
- @ApiModelProperty(value = "纭鏃堕棿")
+ private String manageUser;
+ /** 闂鎻忚堪;榛樿 鏃� */
+ @ApiModelProperty(name = "闂鎻忚堪",notes = "榛樿 鏃�")
+ private String problemDescription ;
+ /** 澶勭悊鎻忚堪;榛樿 鏃� */
+ @ApiModelProperty(name = "澶勭悊鎻忚堪",notes = "榛樿 鏃�")
+ private String dealDescription ;
+ /** 绠＄悊鍛樼‘璁ゆ椂闂� */
+ @ApiModelProperty(name = "绠＄悊鍛樼‘璁ゆ椂闂�",notes = "")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date confirmTime;
- /**
- * 鍗曚綅棰嗗纭
- */
- @Excel(name = "鍗曚綅棰嗗纭", width = 15)
- @ApiModelProperty(value = "鍗曚綅棰嗗纭")
- @Dict(dicCode = "sys_user, realname, username")
- private String confirmLeader;
- /**
- * 棰嗗鎰忚
- */
- @ApiModelProperty(value = "棰嗗鎰忚")
- private String leaderConfirmComment;
- /**
- * 棰嗗纭鏃堕棿
- */
- @ApiModelProperty(value = "棰嗗纭鏃堕棿")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date leaderConfirmTime;
-
- /**
- * 淇濆吇涓婁紶鍥剧墖
- */
- @Excel(name = "淇濆吇涓婁紶鍥剧墖", width = 15)
- @ApiModelProperty(value = "淇濆吇涓婁紶鍥剧墖")
- private String imageFiles;
+ private Date confirmTime ;
+ /** 妫�鏌ヤ汉纭 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭",notes = "")
+ private String inspector;
+ /** 妫�鏌ヤ汉鎰忚 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉鎰忚",notes = "")
+ private String inspectConfirmComment;
+ /** 妫�鏌ヤ汉纭鏃堕棿 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭鏃堕棿",notes = "")
+ private String inspectConfirmTime;
+ /** HF缂栫爜 */
+ @ApiModelProperty(name = "HF缂栫爜",notes = "")
+ private String hfCode;
/**
* 澶囨敞
*/
@@ -184,4 +163,7 @@
private String equipmentCode;
@TableField(exist = false)
private String equipmentName;
+ //鍨嬪彿
+ @TableField(exist = false)
+ private String equipmentModel;
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java
index 435c04f..6712847 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java
@@ -24,7 +24,7 @@
@Accessors(chain = true)
@ApiModel(value="eam_second_maintenance_order_detail瀵硅薄", description="璁惧浜岀骇淇濆吇鏄庣粏")
public class EamSecondMaintenanceOrderDetail implements Serializable {
-
+
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
@@ -51,28 +51,19 @@
@Excel(name = "椤圭洰搴忓彿", width = 15)
@ApiModelProperty(value = "椤圭洰搴忓彿")
private Integer itemCode;
- /**淇濆吇椤圭洰*/
- @Excel(name = "淇濆吇椤圭洰", width = 15)
- @ApiModelProperty(value = "淇濆吇椤圭洰")
+ /** 淇濆吇鍒嗙被;鎿嶄綔宸ャ�佺淮淇伐 */
+ @ApiModelProperty(name = "淇濆吇鍒嗙被",notes = "鎿嶄綔宸ャ�佺淮淇伐")
+ private String itemCategory;
+ /** 淇濆吇鍐呭 */
+ @ApiModelProperty(name = "淇濆吇鍐呭",notes = "")
private String itemName;
- /**閮ㄤ綅*/
- @Excel(name = "閮ㄤ綅", width = 15)
- @ApiModelProperty(value = "閮ㄤ綅")
- private String itemPart;
- /**淇濆吇瑕佹眰*/
- @Excel(name = "淇濆吇瑕佹眰", width = 15)
- @ApiModelProperty(value = "淇濆吇瑕佹眰")
- private String itemDemand;
- /**淇濆吇缁撴灉*/
- @Excel(name = "淇濆吇缁撴灉", width = 15)
- @ApiModelProperty(value = "淇濆吇缁撴灉")
+ /** 淇濆吇缁撴灉 */
+ @ApiModelProperty(name = "淇濆吇缁撴灉",notes = "")
private String maintenanceResult;
- /**鎶ヤ慨鏍囪*/
- @Excel(name = "鎶ヤ慨鏍囪", width = 15)
- @ApiModelProperty(value = "鎶ヤ慨鏍囪")
+ /** 鎶ヤ慨鏍囪 */
+ @ApiModelProperty(name = "鎶ヤ慨鏍囪",notes = "")
private String reportFlag;
- /**寮傚父鎻忚堪*/
- @Excel(name = "寮傚父鎻忚堪", width = 15)
- @ApiModelProperty(value = "寮傚父鎻忚堪")
+ /** 寮傚父鎻忚堪 */
+ @ApiModelProperty(name = "寮傚父鎻忚堪",notes = "")
private String exceptionDescription;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java
index e12decb..c17443f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSecondMaintenanceOrderController.java
@@ -80,7 +80,7 @@
if (request == null) {
return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
}
- if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ if (StrUtil.isEmpty(request.getStandardId())) {
return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
}
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.SECOND_MAINTENANCE_CODE_RULE);
@@ -106,7 +106,7 @@
if (request == null) {
return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
}
- if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ if (StrUtil.isEmpty(request.getStandardId())) {
return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
}
boolean b = eamSecondMaintenanceOrderService.editMaintenance(request);
@@ -228,7 +228,7 @@
if (request == null) {
return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
}
- if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ if (StrUtil.isEmpty(request.getStandardId())) {
return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
}
// 妫�鏌ヨ姹傚弬鏁�
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml
index a679294..5034d04 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml
@@ -3,10 +3,10 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamSecondMaintenanceOrderMapper">
<select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder">
- select wmo.*, e.equipment_code, e.equipment_name
+ select wmo.*, e.equipment_code, e.equipment_name,e.equipment_model
from eam_second_maintenance_order wmo
inner join eam_equipment e
on wmo.equipment_id = e.id
${ew.customSqlSegment}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java
index 140cd99..8fbff40 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java
@@ -7,8 +7,10 @@
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.EamSecondMaintenanceOrderDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
+import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -24,43 +26,100 @@
/**涓婚敭*/
@ApiModelProperty(value = "涓婚敭")
private String id;
- /**宸ュ崟鍙�*/
+ /**
+ * 宸ュ崟鍙�
+ */
+ @Excel(name = "宸ュ崟鍙�", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�")
private String orderNum;
- /**璁惧ID*/
+ /**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
- /**鏍囧噯ID*/
+ /**
+ * 鏍囧噯ID
+ */
+ @Excel(name = "鏍囧噯ID", width = 15)
@ApiModelProperty(value = "鏍囧噯ID")
+ @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
private String standardId;
- /**淇濆吇鏃ユ湡*/
- @ApiModelProperty(value = "淇濆吇鏃ユ湡")
+ /**
+ * 璁″垝淇濆吇鏃ユ湡
+ */
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date maintenanceDate;
- /**淇濆吇浜�*/
- @ApiModelProperty(value = "淇濆吇浜�")
- private String operator;
- /**澶囨敞*/
+ /**
+ * 瀹為檯寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualStartTime;
+ /**
+ * 瀹為檯缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualEndTime;
+ /** 鎿嶄綔宸� */
+ @ApiModelProperty(value = "鎿嶄綔宸�")
+ private String operator ;
+ /** 缁翠慨宸� */
+ @ApiModelProperty(value = "缁翠慨宸�")
+ private String repairman ;
+ /**
+ * 淇濆吇鐘舵�� 寰呬繚鍏汇�佷繚鍏讳腑銆佺鐞嗗憳纭銆佹鏌ヤ汉纭銆佸凡瀹屾垚
+ */
+ @Excel(name = "淇濆吇鐘舵��", width = 15)
+ @ApiModelProperty(value = "淇濆吇鐘舵��")
+ @Dict(dicCode = "second_maintenance_status")
+ private String maintenanceStatus;
+ /**
+ * 鍒涘缓鏂瑰紡
+ */
+ @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
+ @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ @Dict(dicCode = "order_creation_method")
+ private String creationMethod;
+ /**
+ * 绠＄悊鍛樼‘璁�
+ */
+ @Excel(name = "绠＄悊鍛樼‘璁�", width = 15)
+ @ApiModelProperty(value = "绠＄悊鍛樼‘璁�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String manageUser;
+ /** 闂鎻忚堪;榛樿 鏃� */
+ @ApiModelProperty(name = "闂鎻忚堪",notes = "榛樿 鏃�")
+ private String problemDescription ;
+ /** 澶勭悊鎻忚堪;榛樿 鏃� */
+ @ApiModelProperty(name = "澶勭悊鎻忚堪",notes = "榛樿 鏃�")
+ private String dealDescription ;
+ /** 绠＄悊鍛樼‘璁ゆ椂闂� */
+ @ApiModelProperty(name = "绠＄悊鍛樼‘璁ゆ椂闂�",notes = "")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime ;
+ /** 妫�鏌ヤ汉纭 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭",notes = "")
+ private String inspector;
+ /** 妫�鏌ヤ汉鎰忚 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉鎰忚",notes = "")
+ private String inspectConfirmComment;
+ /** 妫�鏌ヤ汉纭鏃堕棿 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭鏃堕棿",notes = "")
+ private String inspectConfirmTime;
+ /** HF缂栫爜 */
+ @ApiModelProperty(name = "HF缂栫爜",notes = "")
+ private String hfCode;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
- /**鍒涘缓鏂瑰紡*/
- @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
- private String creationMethod;
- /**鍒楄〃 淇濆吇椤规槑缁�*/
- @ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
- private List<EamSecondMaintenanceOrderDetail> tableDetailList;
- /**鍒犻櫎 淇濆吇椤规槑缁�*/
- @ApiModelProperty(value = "鍒犻櫎 淇濆吇椤规槑缁�")
- private List<EamSecondMaintenanceOrderDetail> removeDetailList;
-
- //纭鎿嶄綔
- /**纭鎰忚*/
- @ApiModelProperty(value = "纭鎰忚")
- private String confirmComment;
- @ApiModelProperty(value = "纭绫诲瀷")
- private String confirmDealType;
- /**棰嗗纭鎰忚*/
- @ApiModelProperty(value = "棰嗗纭鎰忚")
- private String leaderConfirmComment;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index 1827589..b26bfbe 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -39,6 +39,7 @@
import org.jeecg.modules.system.service.IBaseFactoryUserService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -82,6 +83,10 @@
private IEamReportRepairService eamReportRepairService;
@Autowired
private IEamEquipmentExtendService eamEquipmentExtendService;
+ @Autowired
+ private IEamBaseHFCodeService hfCodeService;
+ @Autowired
+ private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
@Override
public IPage<EamSecondMaintenanceOrder> queryPageList(Page<EamSecondMaintenanceOrder> page, EamSecondMaintenanceQuery query) {
@@ -155,6 +160,12 @@
order.setStandardId(request.getStandardId());
order.setMaintenanceDate(request.getMaintenanceDate());
order.setOperator(request.getOperator());
+ //鎶�鏈姸鎬侀壌瀹氳〃
+ EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.SECOND_MAINTENANCE.name());
+ if(eamBaseHFCode == null) {
+ throw new JeecgBootException("鏈厤缃妧鏈姸鎬侀壌瀹氳〃鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒");
+ }
+ order.setHfCode(eamBaseHFCode.getHfCode());
order.setRemark(request.getRemark());
//鐘舵�佸垵濮嬪寲
order.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
@@ -163,43 +174,17 @@
order.setDelFlag(CommonConstant.DEL_FLAG_0);
eamSecondMaintenanceOrderMapper.insert(order);
//澶勭悊鏄庣粏鏁版嵁
- if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
- request.getTableDetailList().forEach(tableDetail -> {
- tableDetail.setId(null);
- tableDetail.setOrderId(order.getId());
+ List<EamMaintenanceStandardDetail> eamMaintenanceStandardDetailList= eamMaintenanceStandardDetailService.selectByStandardId(order.getStandardId());
+ List<EamSecondMaintenanceOrderDetail> requestTableDetailList = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(eamMaintenanceStandardDetailList)) {
+ eamMaintenanceStandardDetailList.forEach(item -> {
+ EamSecondMaintenanceOrderDetail detail = new EamSecondMaintenanceOrderDetail();
+ BeanUtils.copyProperties(item, detail);
+ detail.setOrderId(order.getId());
+ requestTableDetailList.add(detail);
});
- secondMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
+ secondMaintenanceOrderDetailService.saveBatch(requestTableDetailList);
}
- //鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
- if (StringUtils.isNotBlank(order.getOperator())) {
- //鍚姩娴佺▼
- flowCommonService.initActBusiness("宸ュ崟鍙�: " + order.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";瀹夎浣嶇疆" + equipment.getInstallationPosition(),
- order.getId(), "IEamSecondMaintenanceOrderService", "second_maintenance_process", null);
- Map<String, Object> variables = new HashMap<>();
- variables.put("dataId", order.getId());
- if (StrUtil.isEmpty(order.getRemark())) {
- variables.put("organization", "鏂板浜屼繚宸ュ崟榛樿鍚姩娴佺▼");
- variables.put("comment", "鏂板浜屼繚宸ュ崟榛樿鍚姩娴佺▼");
- } else {
- variables.put("organization", order.getRemark());
- variables.put("comment", order.getRemark());
- }
- variables.put("proofreading", true);
- List<String> usernames = new ArrayList<>();
- usernames.add(order.getOperator());
- variables.put("NextAssignee", usernames);
- Result result = flowDefinitionService.startProcessInstanceByKey("second_maintenance_process", variables);
- if (result != null) {
- //鏇存柊鍛ㄤ繚鐘舵��
- order.setMaintenanceStatus(SecondMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
- order.setActualStartTime(new Date());
- eamSecondMaintenanceOrderMapper.updateById(order);
- //鏇存柊璁惧淇濆吇鐘舵��
- eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name());
- return result.isSuccess();
- }
- }
-
return true;
}
@@ -218,33 +203,9 @@
throw new JeecgBootException("鍙湁寰呬繚鍏荤姸鎬佺殑鏁版嵁鎵嶅彲缂栬緫锛�");
}
entity.setMaintenanceDate(request.getMaintenanceDate());
- entity.setOperator(request.getOperator());
entity.setRemark(request.getRemark());
eamSecondMaintenanceOrderMapper.updateById(entity);
- //澶勭悊璇︽儏
- if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
- List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
- List<EamSecondMaintenanceOrderDetail> updateList = new ArrayList<>();
- request.getTableDetailList().forEach(tableDetail -> {
- tableDetail.setOrderId(entity.getId());
- if (tableDetail.getId() == null) {
- addList.add(tableDetail);
- } else {
- updateList.add(tableDetail);
- }
- });
- if (CollectionUtil.isNotEmpty(addList)) {
- secondMaintenanceOrderDetailService.saveBatch(addList);
- }
- if (CollectionUtil.isNotEmpty(updateList)) {
- secondMaintenanceOrderDetailService.updateBatchById(updateList);
- }
- }
- if (CollectionUtil.isNotEmpty(request.getRemoveDetailList())) {
- List<String> ids = request.getRemoveDetailList().stream().map(EamSecondMaintenanceOrderDetail::getId).collect(Collectors.toList());
- secondMaintenanceOrderDetailService.removeBatchByIds(ids);
- }
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
if (StringUtils.isNotBlank(entity.getOperator())) {
//鍚姩娴佺▼
@@ -385,10 +346,6 @@
//璁剧疆entity
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_CONFIRM.name());
entity.setActualEndTime(new Date());
- //澶勭悊璇︽儏
- if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
- secondMaintenanceOrderDetailService.updateBatchById(request.getTableDetailList());
- }
//鏇存柊璁惧淇濆吇鐘舵��
eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.SECOND_MAINTENANCE_WAIT_CONFIRM.name());
break;
@@ -399,33 +356,12 @@
}
//鐝粍闀跨‘璁�
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
- values.put("dataId", entity.getId());
- values.put("organization", request.getConfirmComment());
- values.put("comment", request.getConfirmComment());
- values.put("NextAssignee", userApprovalList);
- values.put("confirmation", request.getConfirmDealType());
- request.setComment(request.getConfirmComment());
//璁剧疆entity
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_LEADER_CONFIRM.name());
entity.setConfirmTime(new Date());
- if (CommonConstant.HAS_CANCLE.equals(request.getConfirmDealType())) {
- //椹冲洖
- userApprovalList = new ArrayList<>();
- userApprovalList.add(entity.getOperator());
- values.put("NextAssignee", userApprovalList);
- entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
- }
- //澶勭悊鎶ヤ慨
- List<EamSecondMaintenanceOrderDetail> collect = request.getTableDetailList().stream().filter((detail) -> CommonConstant.DEFAULT_1.equals(detail.getReportFlag())).collect(Collectors.toList());
- if (CollectionUtil.isNotEmpty(collect)) {
- eamReportRepairService.reportRepairFromSecondMaintenance(equipment.getId(), entity.getOperator(), collect);
- }
break;
case WAIT_LEADER_CONFIRM:
values.put("dataId", entity.getId());
- values.put("organization", request.getLeaderConfirmComment());
- values.put("comment", request.getLeaderConfirmComment());
- request.setComment(request.getLeaderConfirmComment());
//璁剧疆entity
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.COMPLETE.name());
//鏇存柊璁惧淇濆吇鐘舵��
--
Gitblit v1.9.3