From 2d3ded65b3c30b4f5cba6080d9c28e16a0b296cc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 七月 2025 20:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 59 ++++++++++++++++---
db/430设备管理数据库设计.pdma.json | 22 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java | 22 +++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java | 14 ++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 40 ++++++++-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 8 +-
6 files changed, 133 insertions(+), 32 deletions(-)
diff --git "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
index bd91e0f..846a94a 100644
--- "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
+++ "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
@@ -2,9 +2,9 @@
"name": "430璁惧绠＄悊鏁版嵁搴撹璁�",
"describe": "鎻忚堪璁惧绠＄悊鏁版嵁搴撹璁℃枃妗�",
"avatar": "",
- "version": "4.9.2",
+ "version": "4.9.4",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-7-14 11:25:39",
+ "updatedTime": "2025-7-15 10:15:51",
"dbConns": [],
"profile": {
"default": {
@@ -1610,6 +1610,24 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "AD503E36-C231-4D72-8643-AE270605278C"
+ },
+ {
+ "defKey": "true_heat_treatment",
+ "defName": "鐪熺┖鐑鐞嗙倝",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "50146CF4-21BF-4B90-A7EA-C4DB721CBBFC"
}
],
"correlations": [],
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 97be295..8723d08 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
@@ -322,16 +322,24 @@
private String equipmentSpecification;
/**
+ * 鐪熺┖鐑鐞嗙倝
+ */
+ @Excel(name = "鐪熺┖鐑鐞嗙倝", width = 15, orderNum = "35")
+ @ApiModelProperty(value = "鐪熺┖鐑鐞嗙倝")
+ @Dict(dicCode = "yn")
+ private String trueHeatTreatment;
+
+ /**
* 鎬诲姛鐜�(KW)
*/
- @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "35")
+ @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "36")
@ApiModelProperty(value = "鎬诲姛鐜�")
private String equipmentPower;
/**
* 璐ㄤ繚寮�濮嬫棩鏈�
*/
- @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 25, format = "yyyy/MM/dd", orderNum = "36")
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 25, format = "yyyy/MM/dd", orderNum = "37")
@ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -340,7 +348,7 @@
/**
* 璐ㄤ繚缁撴潫鏃ユ湡
*/
- @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "37")
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "38")
@ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -349,14 +357,14 @@
/**
* 璧勪骇鐘舵��
*/
- @Excel(name = "璧勪骇鐘舵��", width = 15, orderNum = "38",dicCode = "asset_status")
+ @Excel(name = "璧勪骇鐘舵��", width = 15, orderNum = "39",dicCode = "asset_status")
@ApiModelProperty(value = "璧勪骇鐘舵��")
@Dict(dicCode = "asset_status")
private String assetStatus;
/**鏈�鏂颁簩淇濇棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鏈�鏂颁簩淇濇棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "39")
+ @Excel(name = "鏈�鏂颁簩淇濇棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "40")
@ApiModelProperty(value = "鏈�鏂颁簩淇濇棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -364,7 +372,7 @@
/**涓嬫浜屼繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "涓嬫浜屼繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "40")
+ @Excel(name = "涓嬫浜屼繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "41")
@ApiModelProperty(value = "涓嬫浜屼繚鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -373,7 +381,7 @@
/**鏈涓変繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "鏈涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd",orderNum = "41")
+ @Excel(name = "鏈涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd",orderNum = "42")
@ApiModelProperty(value = "鏈涓変繚鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -381,7 +389,7 @@
/**涓嬫涓変繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "涓嬫涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "42")
+ @Excel(name = "涓嬫涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "43")
@ApiModelProperty(value = "涓嬫涓変繚鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -389,34 +397,34 @@
/**涓変繚鍛ㄦ湡(骞�)*/
@TableField(exist = false)
- @Excel(name = "涓変繚鍛ㄦ湡(骞�)", width = 15, orderNum = "43")
+ @Excel(name = "涓変繚鍛ㄦ湡(骞�)", width = 15, orderNum = "44")
@ApiModelProperty(value = "涓変繚鍛ㄦ湡(骞�)")
private Integer thirdMaintenancePeriod;
/**鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "44")
+ @Excel(name = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "45")
@ApiModelProperty(value = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date latestTechnologyCheck;
/**鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "45")
+ @Excel(name = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "46")
@ApiModelProperty(value = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date nextTechnologyCheck;
/**鎶�鏈壌瀹氬懆鏈�(骞�)*/
@TableField(exist = false)
- @Excel(name = "鎶�鏈壌瀹氬懆鏈�(骞�)", width = 15, orderNum = "46")
+ @Excel(name = "鎶�鏈壌瀹氬懆鏈�(骞�)", width = 15, orderNum = "47")
@ApiModelProperty(value = "鎶�鏈壌瀹氬懆鏈�(骞�)")
private Integer technologyCheckPeriod;
/**
* 鏄惁涓昏澶�
*/
- @Excel(name = "鏄惁涓昏澶�", width = 15, dicCode = "yn", orderNum = "47")
+ @Excel(name = "鏄惁涓昏澶�", width = 15, dicCode = "yn", orderNum = "48")
@ApiModelProperty(value = "鏄惁涓昏澶�")
@Dict(dicCode = "yn")
private String masterFlag;
@@ -425,14 +433,14 @@
/**
* 鏄惁鏈夊伐鑹哄弬鏁�
*/
- @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "yn", orderNum = "48")
+ @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "yn", orderNum = "49")
@ApiModelProperty(value = "鏄惁鏈夊伐鑹哄弬鏁�")
@Dict(dicCode = "yn")
private String processParametersFlag;
/**
* 鏄惁鏈夌簿搴﹀弬鏁�
*/
- @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "yn", orderNum = "49")
+ @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "yn", orderNum = "50")
@ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�")
@Dict(dicCode = "yn")
private String precisionParametersFlag;
@@ -441,7 +449,7 @@
/**
* 澶囨敞
*/
- @Excel(name = "澶囨敞", width = 50, orderNum = "50")
+ @Excel(name = "澶囨敞", width = 50, orderNum = "51")
@ApiModelProperty(value = "澶囨敞")
private String remark;
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 75db204..9624cd6 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
@@ -130,6 +130,12 @@
@ApiModelProperty(value = "绠＄悊鍛樼‘璁�")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String manageUser;
+ /**
+ * 绠＄悊鍛樼‘璁ょ粨鏋�
+ */
+ @ApiModelProperty(value = "绠＄悊鍛樼‘璁ょ粨鏋�")
+ @Dict(dicCode = "approve_reject")
+ private String manageUserResult;
/** 闂鎻忚堪;榛樿 鏃� */
@ApiModelProperty(name = "闂鎻忚堪",notes = "榛樿 鏃�")
private String problemDescription ;
@@ -140,11 +146,17 @@
@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 ;
+ private Date confirmTime;
/** 妫�鏌ヤ汉纭 */
@ApiModelProperty(name = "妫�鏌ヤ汉纭",notes = "")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String inspector;
+ /**
+ * 妫�鏌ヤ汉纭缁撴灉
+ */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭缁撴灉",notes = "")
+ @Dict(dicCode = "approve_reject")
+ private String inspectorResult;
/** 妫�鏌ヤ汉鎰忚 */
@ApiModelProperty(name = "妫�鏌ヤ汉鎰忚",notes = "")
private String inspectConfirmComment;
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 8fbff40..de66e47 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
@@ -8,7 +8,9 @@
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
+import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -93,6 +95,12 @@
@ApiModelProperty(value = "绠＄悊鍛樼‘璁�")
@Dict(dicCode = "sys_user, realname, username")
private String manageUser;
+ /**
+ * 绠＄悊鍛樼‘璁ょ粨鏋�
+ */
+ @ApiModelProperty(value = "绠＄悊鍛樼‘璁ょ粨鏋�")
+ @Dict(dicCode = "approve_reject")
+ private String manageUserResult;
/** 闂鎻忚堪;榛樿 鏃� */
@ApiModelProperty(name = "闂鎻忚堪",notes = "榛樿 鏃�")
private String problemDescription ;
@@ -107,6 +115,12 @@
/** 妫�鏌ヤ汉纭 */
@ApiModelProperty(name = "妫�鏌ヤ汉纭",notes = "")
private String inspector;
+ /**
+ * 妫�鏌ヤ汉纭缁撴灉
+ */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭缁撴灉",notes = "")
+ @Dict(dicCode = "approve_reject")
+ private String inspectorResult;
/** 妫�鏌ヤ汉鎰忚 */
@ApiModelProperty(name = "妫�鏌ヤ汉鎰忚",notes = "")
private String inspectConfirmComment;
@@ -122,4 +136,12 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ /**鍒楄〃 缁翠慨宸ユ槑缁�*/
+ @ApiModelProperty(value = "鍒楄〃 缁翠慨宸ユ槑缁�")
+ private List<EamSecondMaintenanceOrderDetail> repairmanDetailList;;
+
+ /**鍒楄〃 鎿嶄綔宸ユ槑缁�*/
+ @ApiModelProperty(value = "鍒楄〃 缁翠慨宸ユ槑缁�")
+ private List<EamSecondMaintenanceOrderDetail> operatorDetailList;;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 0f997e7..3aa977a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -594,9 +594,11 @@
// 瑙﹀彂淇濆吇娴佺▼
SysParams sysParams = sysParamsService.getSysPramBySettingKey("maintenance_import_type");
- if (sysParams != null && sysParams.getSettingValue().equals("1")) {
- eamMaintenanceStandard.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
- eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
+ if (sysParams != null) {
+ if (sysParams.getSettingValue().equals("1")){
+ eamMaintenanceStandard.setStandardStatus(MaintenanceStandardStatusEnum.WAIT_SUBMIT.name());
+ eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
+ }
} else {
return Result.error("鏈壘鍒颁繚鍏绘祦绋嬪鍏ョ浉鍏抽厤缃�,璇疯仈绯荤鐞嗗憳");
}
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 75ab1fa..e59f21d 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
@@ -259,13 +259,16 @@
throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
}
}
+ List<String> usernames = new ArrayList<>();
if (sysUser != null) {
- entity.setOperator(sysUser.getUsername());
- }
- if (BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
- entity.setOperator(sysUser.getUsername());
- }else if (BusinessCodeConst.PCR0002.equals(sysUser.getPost())) {
- entity.setRepairman(sysUser.getUsername());
+ if (BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
+ entity.setOperator(sysUser.getUsername());
+ usernames.add(entity.getOperator());
+ }
+ if (BusinessCodeConst.PCR0002.equals(sysUser.getPost())) {
+ entity.setRepairman(sysUser.getUsername());
+ usernames.add(entity.getRepairman());
+ }
}
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
entity.setActualStartTime(new Date());
@@ -283,8 +286,6 @@
variables.put("comment", entity.getRemark());
}
variables.put("proofreading", true);
- List<String> usernames = new ArrayList<>();
- usernames.add(entity.getOperator());
if (sysUser != null) {
if (BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
variables.put("operator_task", usernames);
@@ -371,14 +372,48 @@
}
if (BusinessCodeConst.PCR0001.equals(user.getPost())) {
entity.setOperator(user.getUsername());
+ values.put("organization", "浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
+ values.put("comment", "浜屼繚鎿嶄綔宸ユ墽琛岀粨鏉�");
//澶勭悊瀵瑰簲璇︽儏
+ if (CollectionUtils.isNotEmpty(request.getOperatorDetailList())){
+ //鍒犻櫎鍘熸湁鏁版嵁
+ List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
+ //鍏堝垹闄ゅ師鏈�
+ LambdaQueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, entity.getId());
+ queryWrapper.eq(EamSecondMaintenanceOrderDetail::getItemCategory,EamMaintenanceStandardDetailCategory.OPERATOR_MAINTENANCE.name());
+ secondMaintenanceOrderDetailService.remove(queryWrapper);
+ request.getOperatorDetailList().forEach(tableDetail -> {
+ EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
+ BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
+ eamMaintenanceStandardDetail.setOrderId(entity.getId());
+ addList.add(eamMaintenanceStandardDetail);
+ });
+ secondMaintenanceOrderDetailService.saveBatch(addList);
+ }
}else if (BusinessCodeConst.PCR0002.equals(user.getPost())) {
entity.setRepairman(user.getUsername());
+ values.put("organization", "浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
+ values.put("comment", "浜屼繚缁翠慨宸ユ墽琛岀粨鏉�");
//澶勭悊瀵瑰簲璇︽儏
+ if (CollectionUtils.isNotEmpty(request.getRepairmanDetailList())){
+ //鍒犻櫎鍘熸湁鏁版嵁
+ List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
+ //鍏堝垹闄ゅ師鏈�
+ LambdaQueryWrapper<EamSecondMaintenanceOrderDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamSecondMaintenanceOrderDetail::getOrderId, entity.getId());
+ queryWrapper.eq(EamSecondMaintenanceOrderDetail::getItemCategory,EamMaintenanceStandardDetailCategory.REPAIRER_MAINTENANCE.name());
+ secondMaintenanceOrderDetailService.remove(queryWrapper);
+ request.getRepairmanDetailList().forEach(tableDetail -> {
+ EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
+ BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
+ eamMaintenanceStandardDetail.setOrderId(entity.getId());
+ addList.add(eamMaintenanceStandardDetail);
+ });
+ secondMaintenanceOrderDetailService.saveBatch(addList);
+ }
}
values.put("dataId", entity.getId());
- values.put("organization", "涓変繚鎵ц缁撴潫");
- values.put("comment", "涓変繚鎵ц缁撴潫");
break;
case WAIT_ADMIN_CONFIRM:
//绠＄悊鍛樼‘璁�
@@ -391,9 +426,11 @@
values.put("dataId", entity.getId());
values.put("organization",request.getComment());
values.put("comment", request.getComment());
+ values.put("manageUserResult",request.getManageUserResult());
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_INSPECTOR_CONFIRM.name());
entity.setManageUser(user.getUsername());
entity.setProblemDescription(request.getProblemDescription());
+ entity.setManageUserResult(request.getManageUserResult());
entity.setDealDescription(request.getComment());
entity.setConfirmTime(new Date());
}
@@ -403,8 +440,10 @@
values.put("dataId", entity.getId());
values.put("organization",request.getComment());
values.put("comment", request.getComment());
+ values.put("inspectorResult",request.getInspectorResult());
entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.COMPLETE.name());
entity.setInspector(user.getUsername());
+ entity.setInspectorResult(request.getInspectorResult());
entity.setInspectConfirmComment(request.getInspectConfirmComment());
entity.setInspectConfirmTime(new Date());
break;
--
Gitblit v1.9.3