From 0311b76a17a8f961beb2e1e9cbebb331f5b23f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 3 Dec 2024 08:43:12 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technology/TechnologyApplication.java | 1 - .../pojo/entity/VirtualWorkingEntity.java | 20 +++++++++---------- .../technology/service/CostConfigService.java | 2 ++ .../service/TechnologyConfigService.java | 8 ++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/TechnologyApplication.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/TechnologyApplication.java index 6497b6cc..0819a666 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/TechnologyApplication.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/TechnologyApplication.java @@ -1,7 +1,6 @@ package com.nflg.product.technology; import com.mzt.logapi.starter.annotation.EnableLogRecord; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/VirtualWorkingEntity.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/VirtualWorkingEntity.java index d9f4bba5..f92269f9 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/VirtualWorkingEntity.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/VirtualWorkingEntity.java @@ -32,41 +32,41 @@ public class VirtualWorkingEntity extends EntityBase implements Serializable { @TableField(value = "hourly_auxiliary_fee") @ApiModelProperty(value = "每小时辅助费用") - private BigDecimal hourlyAuxiliaryFee; + private BigDecimal hourlyAuxiliaryFee = BigDecimal.ZERO; @TableField(value = "user_num") @ApiModelProperty(value = "本车间一线人数") - private Integer userNum; + private Integer userNum = 0; @TableField(value = "workshop_total_fee") @ApiModelProperty(value = "年度总费用") - private BigDecimal workshopTotalFee; + private BigDecimal workshopTotalFee = BigDecimal.ZERO; @TableField(value = "consumables_fee") @ApiModelProperty(value = "水电费、生产耗材费用") - private BigDecimal consumablesFee; + private BigDecimal consumablesFee = BigDecimal.ZERO; @TableField(value = "equipment_depreciation_fee") @ApiModelProperty("设备折旧") - private BigDecimal equipmentDepreciationFee; + private BigDecimal equipmentDepreciationFee = BigDecimal.ZERO; @TableField(value = "workshop_labor_fee") @ApiModelProperty("车间管理人工费") - private BigDecimal workshopLaborFee; + private BigDecimal workshopLaborFee = BigDecimal.ZERO; @TableField(value = "workshop_office_fee") @ApiModelProperty("车间办公室费用") - private BigDecimal workshopOfficeFee; + private BigDecimal workshopOfficeFee = BigDecimal.ZERO; @TableField(value = "assistant_total_fee") @ApiModelProperty("辅助部门年度总费用") - private BigDecimal assistantTotalFee; + private BigDecimal assistantTotalFee = BigDecimal.ZERO; @TableField(value = "assistant_labor_fee") @ApiModelProperty("辅助部门人工费") - private BigDecimal assistantLaborFee; + private BigDecimal assistantLaborFee = BigDecimal.ZERO; @TableField(value = "assistant_fee") @ApiModelProperty("辅助部门费用") - private BigDecimal assistantFee; + private BigDecimal assistantFee = BigDecimal.ZERO; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/CostConfigService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/CostConfigService.java index 3c9c4b89..92d6f177 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/CostConfigService.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/CostConfigService.java @@ -97,6 +97,7 @@ public class CostConfigService { configs.put(TechnologyConfigEnum.THEORETICAL_DAILY_WORKING_HOURS.getValue(), BigDecimal.valueOf(query.getDailyHours())); configs.put(TechnologyConfigEnum.THEORETICAL_WORKING_DAYS_PER_MONTH.getValue(), BigDecimal.valueOf(query.getMonthlyWorkingDays())); configs.put(TechnologyConfigEnum.CORRECTION_FACTOR.getValue(), query.getCorrectionFactor()); + configs.put(TechnologyConfigEnum.MONTHLY_THEORETICAL_FULL_LOAD_WORKING_HOURS.getValue(), query.getMonthlyWorkingHours()); technologyConfigService.save(configs); } @@ -106,6 +107,7 @@ public class CostConfigService { vo.setDailyHours(BigDecimalUtil.toInteger(technologyConfigService.getTheoreticalDailyWorkingHours())); vo.setMonthlyWorkingDays(BigDecimalUtil.toInteger(technologyConfigService.getTheoreticalWorkingDaysPerMonth())); vo.setCorrectionFactor(technologyConfigService.getCorrectionFactor()); + vo.setMonthlyWorkingHours(technologyConfigService.getMonthlyTheoreticalFullLoadWorkingHours()); return vo; } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/TechnologyConfigService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/TechnologyConfigService.java index 93b0d421..52ccf6b9 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/TechnologyConfigService.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/TechnologyConfigService.java @@ -1,7 +1,6 @@ package com.nflg.product.technology.service; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.technology.constant.TechnologyConfigEnum; @@ -110,10 +109,11 @@ public class TechnologyConfigService extends ServiceImpl