From c2559ec44a1d51a30622125af2064f07c1d3d8b7 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期三, 18 十月 2023 18:06:49 +0800
Subject: [PATCH] 操作证管理 明细更新
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java | 17 ++++++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateServiceImpl.java | 12 ++++++------
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
index 12d2511..6f3dd5d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
@@ -289,5 +289,20 @@
}
return Result.OK("鏂囦欢瀵煎叆澶辫触锛�");
}
-
+ /**
+ * 閫氳繃涓昏〃ID鏌ヨ
+ * @return
+ */
+ //@AutoLog(value = "鎿嶄綔璇佺鐞嗘槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+ @ApiOperation(value="鎿嶄綔璇佺鐞嗘槑缁�-閫氳繃涓昏〃ID鏌ヨ", notes="鎿嶄綔璇佺鐞嗘槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+ @GetMapping(value = "/listOperationCertificateDetailByMainId")
+ public Result<IPage<OperationCertificateDetail>> listOperationCertificateDetailByMainId(OperationCertificateDetail operationCertificateDetail,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<OperationCertificateDetail> queryWrapper = QueryGenerator.initQueryWrapper(operationCertificateDetail, req.getParameterMap());
+ Page<OperationCertificateDetail> page = new Page<OperationCertificateDetail>(pageNo, pageSize);
+ IPage<OperationCertificateDetail> pageList = operationCertificateDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java
index 7b183c7..2fa74d4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java
@@ -44,6 +44,7 @@
/**璁惧id*/
@Excel(name = "璁惧id", width = 15)
@ApiModelProperty(value = "璁惧id")
+ @Dict(dictTable = "mom_eam_equipment", dicText = "num", dicCode = "id")
private String equipmentId;
/**鎵ｅ垎椤�*/
@Excel(name = "鎵ｅ垎椤�", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateServiceImpl.java
index e4ba5ad..7f3cbfc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateServiceImpl.java
@@ -48,7 +48,7 @@
String equipmentIds = operationCertificate.getEquipmentIds();
Integer currentCycleScore = operationCertificate.getCurrentCycleScore();
for (OperationCertificateDetail entity : operationCertificateDetailList) {
- if ("addEquipment".equals(entity.getType())) {
+ if ("addEquipment".equals(entity.getType()) && !equipmentIds.contains(entity.getEquipmentId())) {
equipmentIds = equipmentIds + "," + entity.getEquipmentId();
} else if ("deduction".equals(entity.getType())) {
String deductionItemId = entity.getDeductionItem();
@@ -61,8 +61,8 @@
}
operationCertificate.setEquipmentIds(equipmentIds);
- if(currentCycleScore<=0){
- currentCycleScore=0;
+ if (currentCycleScore <= 0) {
+ currentCycleScore = 0;
// 褰撳垎鏁颁负0鏃�,璁剧疆鎿嶄綔璇佺殑鐘舵�佷负绂佺敤
operationCertificate.setStatus(CommonConstant.STATUS_0);
}
@@ -91,7 +91,7 @@
String equipmentIds = operationCertificate.getEquipmentIds();
Integer currentCycleScore = operationCertificate.getCurrentCycleScore();
for (OperationCertificateDetail entity : operationCertificateDetailList) {
- if ("addEquipment".equals(entity.getType())) {
+ if ("addEquipment".equals(entity.getType()) && !equipmentIds.contains(entity.getEquipmentId())) {
equipmentIds = equipmentIds + "," + entity.getEquipmentId();
} else if ("deduction".equals(entity.getType())) {
String deductionItemId = entity.getDeductionItem();
@@ -104,8 +104,8 @@
}
operationCertificate.setEquipmentIds(equipmentIds);
- if(currentCycleScore<=0){
- currentCycleScore=0;
+ if (currentCycleScore <= 0) {
+ currentCycleScore = 0;
// 褰撳垎鏁颁负0鏃�,璁剧疆鎿嶄綔璇佺殑鐘舵�佷负绂佺敤
operationCertificate.setStatus(CommonConstant.STATUS_0);
}
--
Gitblit v1.9.3