From aea668fc4c96677196978bf3af80be86fd6fa21d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 四月 2025 16:29:15 +0800
Subject: [PATCH] art: 设备管理-周保-保养流程调试修改
---
db/数据库产品化设计.pdma.json | 20 +++++++++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 5 ++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 3 +++
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json" "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
index a495de0..6fe6cc7 100644
--- "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
+++ "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-4-8 16:18:02",
+ "updatedTime": "2025-4-15 16:12:47",
"dbConns": [],
"profile": {
"default": {
@@ -6277,6 +6277,24 @@
"uiHint": null
},
{
+ "defKey": "confirm_deal_type",
+ "defName": "纭绫诲瀷",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "id": "EF6D9EAA-0BD3-462A-84A8-093D70D919EB"
+ },
+ {
"defKey": "confirm_comment",
"defName": "纭鎰忚",
"comment": "",
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
index 6c4d814..45001fb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
@@ -96,6 +96,9 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date confirmTime;
+ /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
+ @ApiModelProperty(value = "纭绫诲瀷")
+ private String confirmDealType;
/**淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧*/
@ApiModelProperty(value = "淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧")
private String imageFiles;
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 b5396f5..14484fa 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
@@ -367,6 +367,9 @@
}
break;
case WAIT_CONFIRM:
+ if(StringUtils.isBlank(equipment.getEquipmentManager())) {
+ throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
//鐝粍闀跨‘璁�
userApprovalList = new ArrayList<>();
userApprovalList.add(equipment.getEquipmentManager());
@@ -397,7 +400,7 @@
case WAIT_INITIAL_ACCEPTANCE:
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0005);
if (CollectionUtil.isEmpty(userSelectors)) {
- throw new JeecgBootException("璁惧鏈垎閰嶇粰鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰璁捐兘閮ㄧ鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
}
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("dataId", entity.getId());
--
Gitblit v1.9.3