From 86ba6f759117d9437bcaab902efa29e8cf72c815 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 25 七月 2025 17:51:36 +0800
Subject: [PATCH] 设备故障登记
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java | 2
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 6 ++-
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java | 96 +++++++++++++++++++++++++++++++++++-------------
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java | 1
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java | 2
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java | 11 +++--
6 files changed, 83 insertions(+), 35 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
index c84f71a..5036a16 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
@@ -88,6 +88,7 @@
/**鎶ヤ慨浜�*/
@Excel(name = "鎶ヤ慨浜�", width = 15)
@ApiModelProperty(value = "鎶ヤ慨浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String reportPerson;
/** 缁翠慨寮�濮嬫椂闂� */
@ApiModelProperty(name = "缁翠慨寮�濮嬫椂闂�",notes = "")
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java
index c979f73..6fb4091 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java
@@ -51,7 +51,7 @@
@Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
- private String delFlag;
+ private Integer delFlag;
/**鎶ヤ慨ID*/
@Excel(name = "鎶ヤ慨ID", width = 15)
@ApiModelProperty(value = "鎶ヤ慨ID")
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java
index 3a800cc..820190d 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java
@@ -45,7 +45,7 @@
@Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
- private String delFlag;
+ private Integer delFlag;
/**鎶ヤ慨ID*/
@Excel(name = "鎶ヤ慨ID", width = 15)
@ApiModelProperty(value = "鎶ヤ慨ID")
@@ -117,7 +117,7 @@
private String district;
/**鍖洪暱纭*/
@Excel(name = "鍖洪暱纭", width = 15)
- @ApiModelProperty(value = "鍖洪暱纭")
+ @ApiModelProperty(value = "鍖洪暱纭鎰忚")
private String districtConfirm;
/**鍖洪暱纭鏃堕棿*/
@Excel(name = "鍖洪暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@@ -125,6 +125,10 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鍖洪暱纭鏃堕棿")
private Date districtTime;
+ /**鍖洪暱纭缁撴灉*/
+ @Excel(name = "鍖洪暱纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "鍖洪暱纭缁撴灉")
+ private String districtResult;
/**涓績涓讳换*/
@Excel(name = "涓績涓讳换", width = 15)
@ApiModelProperty(value = "涓績涓讳换")
@@ -132,14 +136,23 @@
private String centerDirector;
/**涓績涓讳换纭*/
@Excel(name = "涓績涓讳换纭", width = 15)
- @ApiModelProperty(value = "涓績涓讳换纭")
+ @ApiModelProperty(value = "涓績涓讳换纭鎰忚")
private String centerDirectorConfirm;
+ /**涓績涓讳换纭缁撴灉*/
+ @Excel(name = "涓績涓讳换纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "涓績涓讳换纭缁撴灉")
+ private String centerDirectorResult;
/**涓績涓讳换纭鏃堕棿*/
@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 centerDirectorTime;
+ /**缁翠慨宸ョ‘璁�*/
+ @Excel(name = "缁翠慨宸ョ‘璁�", width = 15)
+ @ApiModelProperty(value = "缁翠慨宸ョ‘璁�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+ private String repairConfirm;
/**缁翠慨寮�濮嬫椂闂�*/
@Excel(name = "缁翠慨寮�濮嬫椂闂�", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -172,17 +185,16 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "寤鸿閲囧彇鎺柦鏃堕棿")
private Date suggestionTakeStepsTime;
- /**缁翠慨纭*/
- @Excel(name = "缁翠慨纭", width = 15)
- @ApiModelProperty(value = "缁翠慨纭")
- @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
- private String repairConfirm;
- /**缁翠慨纭鎰忚*/
- @Excel(name = "缁翠慨纭鎰忚", width = 15)
- @ApiModelProperty(value = "缁翠慨纭鎰忚")
+ /**缁翠慨宸ョ‘璁ょ粨鏋�*/
+ @Excel(name = "缁翠慨宸ョ‘璁ょ粨鏋�", width = 15)
+ @ApiModelProperty(value = "缁翠慨宸ョ‘璁ょ粨鏋�")
+ private String repairConfirmResult;
+ /**缁翠慨宸ョ‘璁ゆ剰瑙�*/
+ @Excel(name = "缁翠慨宸ョ‘璁ゆ剰瑙�", width = 15)
+ @ApiModelProperty(value = "缁翠慨宸ョ‘璁ゆ剰瑙�")
private String repairConfirmComment;
- /**缁翠慨纭鏃堕棿*/
- @Excel(name = "缁翠慨纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+ /**缁翠慨宸ョ‘璁ゆ椂闂�*/
+ @Excel(name = "缁翠慨宸ョ‘璁ゆ椂闂�", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "缁翠慨纭鏃堕棿")
@@ -196,27 +208,40 @@
@Excel(name = "缁翠慨缁勯暱鎰忚", width = 15)
@ApiModelProperty(value = "缁翠慨缁勯暱鎰忚")
private String repairGroupLeaderComment;
+ /**缁翠慨缁勯暱纭缁撴灉*/
+ @Excel(name = "缁翠慨缁勯暱纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱纭缁撴灉")
+ private String repairGroupLeaderResult;
/**缁翠慨缁勯暱纭鏃堕棿*/
@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 repairGroupLeaderTime;
- /**缁翠慨缁勯暱纭*/
- @Excel(name = "缁翠慨缁勯暱纭", width = 15)
- @ApiModelProperty(value = "缁翠慨缁勯暱纭")
+ /**缁翠慨缁勯暱(鍖洪暱)纭*/
+ @Excel(name = "缁翠慨缁勯暱(鍖洪暱)纭", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String repairDistrict;
- /**缁翠慨缁勯暱鎰忚*/
- @Excel(name = "缁翠慨缁勯暱鎰忚", width = 15)
- @ApiModelProperty(value = "缁翠慨缁勯暱鎰忚")
+ /**缁翠慨缁勯暱(鍖洪暱)鎰忚*/
+ @Excel(name = "缁翠慨缁勯暱(鍖洪暱)鎰忚", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)鎰忚")
private String repairDistrictComment;
- /**缁翠慨缁勯暱纭鏃堕棿*/
+ /**缁翠慨缁勯暱(鍖洪暱)纭缁撴灉*/
+ @Excel(name = "缁翠慨缁勯暱(鍖洪暱)纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭缁撴灉")
+ private String repairDistrictResult;
+ /**缁翠慨缁勯暱(鍖洪暱)纭鏃堕棿*/
@Excel(name = "缁翠慨缁勯暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "缁翠慨缁勯暱纭鏃堕棿")
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭鏃堕棿")
private Date repairDistrictTime;
+ /**鎶�鏈礋璐ｄ汉*/
+ @Excel(name = "鎶�鏈礋璐ｄ汉", width = 15)
+ @ApiModelProperty(value = "鎶�鏈礋璐ｄ汉")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+ private String technicalDirector;
/**鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰*/
@Excel(name = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰", width = 15)
@ApiModelProperty(value = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰")
@@ -233,11 +258,14 @@
@Excel(name = "浜嬫晠缁撹", width = 15)
@ApiModelProperty(value = "浜嬫晠缁撹")
private String accidentConclusion;
- /**鎶�鏈礋璐ｄ汉*/
- @Excel(name = "鎶�鏈礋璐ｄ汉", width = 15)
- @ApiModelProperty(value = "鎶�鏈礋璐ｄ汉")
- @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
- private String technicalDirector;
+ /**鎶�鏈礋璐ｄ汉纭鎰忚*/
+ @Excel(name = "鎶�鏈礋璐ｄ汉纭鎰忚", width = 15)
+ @ApiModelProperty(value = "鎶�鏈礋璐ｄ汉纭鎰忚")
+ private String technicalDirectorConfirm;
+ /**鎶�鏈礋璐ｄ汉纭缁撴灉*/
+ @Excel(name = "鎶�鏈礋璐ｄ汉纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "鎶�鏈礋璐ｄ汉纭缁撴灉")
+ private String technicalDirectorResult;
/**鎶�鏈礋璐ｄ汉纭鏃堕棿*/
@Excel(name = "鎶�鏈礋璐ｄ汉纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -249,6 +277,14 @@
@ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵�")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String technicalDirectorLeader;
+ /**鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�*/
+ @Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�", width = 15)
+ @ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�")
+ private String technicalDirectorLeaderConfirm;
+ /**鎶�鏈富绠″绾ч瀵肩‘璁ょ粨鏋�*/
+ @Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ょ粨鏋�", width = 15)
+ @ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵肩‘璁ょ粨鏋�")
+ private String technicalDirectorLeaderResult;
/**鎶�鏈富绠″绾ч瀵肩‘璁ゆ椂闂�*/
@Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ椂闂�", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -266,6 +302,14 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗纭鏃堕棿")
private Date technicalDirectorPartTime;
+ /**涓荤閮ㄧ骇棰嗗纭鎰忚*/
+ @Excel(name = "涓荤閮ㄧ骇棰嗗纭鎰忚", width = 15)
+ @ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗纭鎰忚")
+ private String technicalDirectorPartConfirm;
+ /**涓荤閮ㄧ骇棰嗗纭缁撴灉*/
+ @Excel(name = "涓荤閮ㄧ骇棰嗗纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗纭缁撴灉")
+ private String technicalDirectorPartResult;
//鍒楄〃灞曠ず
@TableField(exist = false)
private String equipmentCode;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java
index 3058d9f..0003f16 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java
@@ -129,6 +129,7 @@
if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getEquipmentName())) {
queryWrapper.like("e.equipment_name", eamReportAccidentsRegisterQuery.getEquipmentName());
}
+ queryWrapper.eq("aar.del_flag", CommonConstant.DEL_FLAG_0);
//鎺掑簭
if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getColumn()) && StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getOrder())) {
String column = eamReportAccidentsRegisterQuery.getColumn();
@@ -348,7 +349,7 @@
case PENDING_REPAIR_TEAM_LEADER:
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0013);
if (CollectionUtil.isEmpty(userSelectors)) {
- throw new JeecgBootException("璁惧鏈瓨鍦ㄧ淮淇粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒");
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄧ淮淇尯闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒");
}
userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("NextAssignee", userApprovalList);
@@ -391,7 +392,7 @@
//缁翠慨鍖洪暱鎷掔粷
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
}else {
- eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REPAIR_REGIONAL_MANAGER.name());
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_TECHNICAL_RESPONSIBLE.name());
}
break;
//寰呮妧鏈礋璐ｄ汉澶勭悊
@@ -471,13 +472,13 @@
throw new JeecgBootException("瀹℃壒澶辫触");
}
eamReportAccidentsRegisterDto.setValues(values);
+ //淇濆瓨宸ュ崟
+ this.updateById(eamReportAccidentsRegister);
Result result = flowTaskService.complete(eamReportAccidentsRegisterDto);
if (!result.isSuccess()) {
throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
}
- //淇濆瓨宸ュ崟
- this.updateById(eamReportAccidentsRegister);
- return result;
+ return Result.ok("瀹℃壒鎴愬姛");
}
private boolean claimTask(String taskId, LoginUser user) {
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
index e406f2a..12fdd0f 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -204,7 +204,7 @@
EamReportAccidentsRegister eamReportAccidentsRegister = new EamReportAccidentsRegister();
BeanUtils.copyProperties(eamReportRepairRequest, eamReportAccidentsRegister);
eamReportAccidentsRegister.setReportId(eamReportRepair.getId());
- eamReportAccidentsRegister.setDelFlag(CommonConstant.DEFAULT_0);
+ eamReportAccidentsRegister.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_SUBMIT.name());
iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
}
@@ -216,6 +216,8 @@
eamRepairOrder.setId(null);
eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
eamRepairOrder.setReportId(eamReportRepair.getId());
+ eamRepairOrder.setReportPerson(eamReportRepair.getCreateBy());
+ eamRepairOrder.setFaultPhenomenon(eamReportRepair.getFaultDescription());
eamRepairOrder.setRepairStatus(EamRepairOrderRepairStatusEnum.PENDING_REPAIR.name());
iEamRepairOrderService.save(eamRepairOrder);
//鏇存柊璁惧缁翠慨鐘舵��
@@ -260,7 +262,7 @@
EamReportAccidentsRegister eamReportAccidentsRegister = new EamReportAccidentsRegister();
BeanUtils.copyProperties(eamReportRepairDto, eamReportAccidentsRegister);
eamReportAccidentsRegister.setReportId(eamReportRepairDto.getId());
- eamReportAccidentsRegister.setDelFlag(CommonConstant.DEFAULT_0);
+ eamReportAccidentsRegister.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
eamReportAccidentsRegister.setId(null);
iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java
index 87da014..32b7fd5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportAccidentsRegisterController.java
@@ -181,7 +181,7 @@
if (StrUtil.isBlank(eamReportAccidentsRegisterDto.getTaskId()) || StrUtil.isBlank(eamReportAccidentsRegisterDto.getDataId()) || StrUtil.isBlank(eamReportAccidentsRegisterDto.getInstanceId())) {
return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
}
- return eamReportAccidentsRegisterService.audit(eamReportAccidentsRegisterDto);
+ return eamReportAccidentsRegisterService.audit(eamReportAccidentsRegisterDto);
}
--
Gitblit v1.9.3