From 5d5675fd6b6521c3d3e5887017a090c60897f6cd Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 15 五月 2025 14:18:40 +0800
Subject: [PATCH] bug修复
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 12 +++++++++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcJcRcJobreportServiceImpl.java | 4 ++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcBoardRateVo.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java | 2 +-
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java
index 8550546..b3513a9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java
@@ -177,7 +177,7 @@
mdcBoardRateVo.setOpenRate(equipmentStatisticalInfo.getOpenLong().divide(new BigDecimal("864"), 2, RoundingMode.HALF_UP));
}
if (equipmentStatisticalInfo.getOpenLong().compareTo(BigDecimal.ZERO) > 0) {
- mdcBoardRateVo.setStartRate(equipmentStatisticalInfo.getProcessLong().multiply(new BigDecimal("100").divide(equipmentStatisticalInfo.getOpenLong(), 2, RoundingMode.HALF_UP)));
+ mdcBoardRateVo.setStartRate(equipmentStatisticalInfo.getProcessLong().multiply(new BigDecimal("100")).divide(equipmentStatisticalInfo.getOpenLong(), 2, RoundingMode.HALF_UP));
}
statisticsMap.put(date, mdcBoardRateVo);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcBoardRateVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcBoardRateVo.java
index 6c938b4..af88ec6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcBoardRateVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcBoardRateVo.java
@@ -36,7 +36,7 @@
/**
* 鍚堟牸鐜�
*/
- private BigDecimal passRate = BigDecimal.ZERO;
+ private BigDecimal passRate = new BigDecimal("100");
public MdcBoardRateVo() {
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcJcRcJobreportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcJcRcJobreportServiceImpl.java
index 61b62bf..b3862c9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcJcRcJobreportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcJcRcJobreportServiceImpl.java
@@ -46,10 +46,10 @@
@Override
public BigDecimal findRateByMonth(String equipmentId, String month) {
- BigDecimal rate = BigDecimal.ZERO;
+ BigDecimal rate = new BigDecimal("100");
MesRcJobreport mesRcJobreport = this.baseMapper.findRateByMonth(equipmentId, month);
if (mesRcJobreport != null && mesRcJobreport.getQty().compareTo(BigDecimal.ZERO) > 0) {
- rate = mesRcJobreport.getOkuqty().divide(mesRcJobreport.getQty(), 2, RoundingMode.HALF_UP);
+ rate = mesRcJobreport.getOkuqty().multiply(new BigDecimal("100")).divide(mesRcJobreport.getQty(), 2, RoundingMode.HALF_UP);
}
return rate;
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index ba318e0..520f3ef 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -661,7 +661,17 @@
}
sysUserDepartService.saveBatch(userDepartList);
}
-
+ // 鎵归噺灏嗕骇绾垮拰鐢ㄦ埛淇℃伅寤虹珛鍏宠仈鍏崇郴
+ String productionIds = sysUserExcel.getProductionIds();
+ if (StringUtils.isNotBlank(productionIds)) {
+ String userId = sysUserExcel.getId();
+ String[] productionIdArray = productionIds.split(",");
+ List<MdcUserProduction> userProductionList = new ArrayList<>(productionIdArray.length);
+ for (String productionId : productionIdArray) {
+ userProductionList.add(new MdcUserProduction(userId, productionId));
+ }
+ userProductionService.saveBatch(userProductionList);
+ }
}
} catch (Exception e) {
errorMessage.add("鍙戠敓寮傚父锛�" + e.getMessage());
--
Gitblit v1.9.3