From dd0411e2b33635bae66170b4a51612d835a7bfe7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 11 七月 2025 10:22:16 +0800
Subject: [PATCH] 添加点检HF编码关联
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderBaseResponse.java | 3 +++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 5 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml | 3 ++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 13 ++++++++++++-
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index 5f8f044..7fdc76b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -117,4 +117,9 @@
@ApiModelProperty(value = "璁惧鍨嬪彿")
@TableField(exist = false)
private String equipmentModel;
+
+ /**HF缂栫爜*/
+ @Excel(name = "HF缂栫爜", width = 15)
+ @ApiModelProperty(value = "HF缂栫爜")
+ private String hfCode;
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderBaseResponse.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderBaseResponse.java
index 6d3c3f1..3fcaa32 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderBaseResponse.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderBaseResponse.java
@@ -38,4 +38,7 @@
@ApiModelProperty(value = "鏈�")
private String inspectionMonth;
+
+ @ApiModelProperty(value = "hf缂栫爜")
+ private String hfCode;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
index f67c832..de02038 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
@@ -17,7 +17,8 @@
t2.equipment_model equipmentModel,
t2.factory_org_code factoryName,
DATEPART( YEAR, t1.inspection_date ) AS inspectionYear,
- DATEPART( MONTH, t1.inspection_date ) AS inspectionMonth
+ DATEPART( MONTH, t1.inspection_date ) AS inspectionMonth,
+ t1.hf_code hfCode
FROM
eam_inspection_order t1
LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
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 334fffc..e90a510 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
@@ -90,6 +90,8 @@
private ISysDictService sysDictService;
@Resource
private ISysUserService sysUserService;
+ @Resource
+ private IEamBaseHFCodeService eamBaseHFCodeService;
@Override
public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -429,6 +431,12 @@
//淇敼鐘舵��
eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
eamInspectionOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
+ //HF鐮佸鐞�
+ EamBaseHFCode eamBaseHFCode = eamBaseHFCodeService.selectByCategory(HfTemplateCategoryEnum.INSPECTION.name());
+ if (eamBaseHFCode == null) {
+ return Result.error("娣诲姞澶辫触,鏈厤缃偣妫�HF缂栫爜锛�");
+ }
+ eamInspectionOrder.setHfCode(eamBaseHFCode.getHfCode());
save(eamInspectionOrder);
//澶勭悊鏃ョ偣妫�鏄庣粏鏁版嵁
if (StrUtil.isNotBlank(eamInspectionOrderRequest.getStandardId())) {
@@ -674,7 +682,10 @@
values.put("organization", "鐐规浜虹偣妫�缁撴潫");
values.put("comment", "鐐规浜虹偣妫�缁撴潫");
// 鑾峰彇涓嬩竴姝ユ墽琛屼汉
- List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), null, BusinessCodeConst.PCR0002);
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨宸ワ紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("NextAssignee", userApprovalList);
request.setComment("鐐规浜虹偣妫�缁撴潫");
--
Gitblit v1.9.3