From faf06098c4bf5c351cc190f97a743ddcf2d3fd0c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 09:36:00 +0800
Subject: [PATCH] art: 设备管理-点检工单-点检增加确认类型，确认意见字段
---
db/数据库产品化设计.pdma.json | 40 +++++++++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java | 29 +++-----------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 15 +++----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 16 ++++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 2 -
5 files changed, 61 insertions(+), 41 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 03f6c01..b56842e 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-16 17:11:07",
+ "updatedTime": "2025-4-17 16:10:18",
"dbConns": [],
"profile": {
"default": {
@@ -4717,8 +4717,44 @@
"id": "9E1E21C7-514F-491B-AFD8-BB810BB8D06C"
},
{
+ "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": "0C006924-8415-4148-919E-3EF09EB76D5D"
+ },
+ {
+ "defKey": "confirm_comment",
+ "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": "98BA313C-F5DE-438E-9F58-133F1EE63002"
+ },
+ {
"defKey": "confirm_user",
- "defName": "璁惧绠＄悊鍛樼‘璁�",
+ "defName": "鐝粍闀跨‘璁�",
"comment": "",
"type": "",
"len": "",
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index e6afd18..3360136 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -1,6 +1,5 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -9,7 +8,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index 1d0c12a..540a563 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -112,6 +112,13 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "纭鏃堕棿")
private Date confirmTime;
+ /**纭鎰忚*/
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
+ @ApiModelProperty(value = "纭绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String confirmDealType;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞")
@@ -134,14 +141,6 @@
/**鍒楄〃 淇濆吇椤规槑缁�*/
@ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
private transient List<EamInspectionOrderDetail> tableDetailList;
-
- /**澶勭悊绫诲瀷*/
- @ApiModelProperty(value = "澶勭悊绫诲瀷")
- private transient String dealType;
-
- /**澶勭悊鎰忚*/
- @ApiModelProperty(value = "澶勭悊鎰忚")
- private transient String dealSuggestion;
@ApiModelProperty(value = "璁惧鍚嶇О")
@TableField(exist = false)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
index 691f2b2..fcaa20b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
@@ -26,7 +26,6 @@
private static final long serialVersionUID = 1L;
/**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
private String id;
/**鍒涘缓浜�*/
@@ -47,72 +46,58 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
/**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
/**宸ュ崟鍙�*/
- @Excel(name = "宸ュ崟鍙�", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�")
private String orderNum;
/**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
@Dict(dictTable = "eam_equipment", dicCode = "equipment_code", dicText = "id")
private String equipmentId;
/**鏍囧噯ID*/
- @Excel(name = "淇濆吇鏍囧噯ID", width = 15)
@ApiModelProperty(value = "淇濆吇鏍囧噯ID")
@Dict(dictTable = "eam_maintenance_standard", dicCode = "standard_code", dicText = "id")
private String standardId;
/**鐐规鏃ユ湡*/
- @Excel(name = "鐐规鏃ユ湡锛堣鍒掞級", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鐐规鏃ユ湡")
private Date inspectionDate;
/**鐐规杩囨湡鏃堕棿*/
- @Excel(name = "鐐规杩囨湡鏃堕棿", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鐐规杩囨湡鏃堕棿")
private Date expirationTime;
/**鐐规鏃堕棿*/
- @Excel(name = "鐐规鏃堕棿锛堝疄闄咃級", width = 15, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鐐规鏃堕棿")
private Date operateTime;
/**鐐规浜�*/
- @Excel(name = "鐐规浜�", width = 15)
@ApiModelProperty(value = "鐐规浜�-鏄鍙栦汉")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String operator;
/**鍒涘缓鏂瑰紡*/
- @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
private String creationMethod;
/**鐐规鐘舵��*/
- @Excel(name = "鐐规鐘舵��", width = 15)
@ApiModelProperty(value = "鐐规鐘舵�� 寰呯偣妫�-寰呯‘璁�-宸插畬鎴�")
private String inspectionStatus;
/**鐝粍闀跨‘璁�*/
- @Excel(name = "鐝粍闀跨‘璁�", width = 15)
@ApiModelProperty(value = "鐝粍闀跨‘璁�--棰嗗彇鍚庝骇鐢�")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String confirmUser;
/**纭鏃堕棿*/
- @Excel(name = "纭鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "纭鏃堕棿")
private Date confirmTime;
/**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞")
private String remark;
/**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
- @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧-鎵ц鏃�", width = 15)
@ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
private String imageFiles;
@@ -124,11 +109,11 @@
@ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
private List<EamInspectionOrderDetail> tableDetailList;
- /**澶勭悊绫诲瀷*/
- @ApiModelProperty(value = "澶勭悊绫诲瀷")
- private String dealType;
-
- /**澶勭悊鎰忚*/
- @ApiModelProperty(value = "澶勭悊鎰忚")
- private String dealSuggestion;
+ /**纭鎰忚*/
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
+ @ApiModelProperty(value = "纭绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String confirmDealType;
}
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 9409834..86c177a 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
@@ -388,11 +388,11 @@
} else {
// 鐝粍闀跨‘璁�
values.put("dataId", order.getId());
- values.put("organization", request.getDealSuggestion());
- values.put("comment", request.getDealSuggestion());
- values.put("confirmation", request.getDealType());
- request.setComment(request.getDealSuggestion());
- if ("2".equals(request.getDealType())) {
+ values.put("organization", request.getConfirmComment());
+ values.put("comment", request.getConfirmComment());
+ values.put("confirmation", request.getConfirmDealType());
+ request.setComment(request.getConfirmComment());
+ if ("2".equals(request.getConfirmDealType())) {
// 鐝粍闀块┏鍥�
List<String> usernames = new ArrayList<>();
usernames.add(order.getOperator());
@@ -405,16 +405,18 @@
private void updateOrderStatus(Result result, EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user) {
if (result.isSuccess()) {
- if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getDealType())) {
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getConfirmDealType())) {
// 鐐规瀹屾垚
order.setInspectionStatus(InspectionStatus.WAIT_CONFIRM.name());
order.setOperateTime(new Date());
eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
- } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getDealType())) {
+ } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) {
// 鐝粍闀跨‘璁や换鍔�
order.setInspectionStatus(InspectionStatus.COMPLETE.name());
order.setConfirmUser(user.getUsername());
+ order.setConfirmComment(request.getConfirmComment());
+ order.setConfirmDealType(request.getConfirmDealType());
order.setConfirmTime(new Date());
}
}
--
Gitblit v1.9.3