Lius
2025-05-15 5d5675fd6b6521c3d3e5887017a090c60897f6cd
bug修复
已修改4个文件
20 ■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcBoardRateVo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcJcRcJobreportServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
                }
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() {
    }
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;
    }
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());