From 976571b072145d0f4b7b0f9010cb31178385a170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 4 Jun 2024 18:13:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/utils/NumberConverter.java | 19 +++++++++++++++++++ .../mapper/EmployeeTrainingMapper.xml | 2 +- .../cool/store/entity/EmployeeTrainingDO.java | 2 +- .../store/vo/AssessmentUserTrainingVO.java | 2 +- .../store/vo/EmployeeTrainingDetailVO.java | 2 +- .../com/cool/store/vo/EmployeeTrainingVO.java | 2 +- .../impl/EmployeeTrainingServiceImpl.java | 7 ++++--- .../com/cool/store/job/XxlJobHandler.java | 3 ++- 8 files changed, 30 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/NumberConverter.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/NumberConverter.java index d21aa3900..efb28cf76 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/NumberConverter.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/NumberConverter.java @@ -1,5 +1,9 @@ package com.cool.store.utils; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.DecimalFormat; + /** * @author zhangchenbiao * @FileName: NumberConverter @@ -30,5 +34,20 @@ public class NumberConverter { } return result; } + + + public static Float convertMath(String mathExpression) { + BigDecimal bd = null; + try { + if (StringUtil.isEmpty(mathExpression)){ + return null; + } + bd = new BigDecimal(mathExpression); + bd = bd.setScale(1, RoundingMode.HALF_UP); + return bd.floatValue(); + }catch (Exception e){ + return null; + } + } } diff --git a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml index 6f1c0fd61..e858c09b9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml @@ -20,7 +20,7 @@ - + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/EmployeeTrainingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/EmployeeTrainingDO.java index d964f2c60..6b36792ab 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/EmployeeTrainingDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/EmployeeTrainingDO.java @@ -105,7 +105,7 @@ public class EmployeeTrainingDO { * 理论考试分值 */ @Column(name = "theoretical_exam_score") - private Integer theoreticalExamScore; + private Float theoreticalExamScore; /** * 实操考试状态 0-未开始 1-合格 2-不合格 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java index b66ab1382..173d88b1c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java @@ -84,7 +84,7 @@ public class AssessmentUserTrainingVO { * 理论考试分值 */ @ApiModelProperty("理论考试分值") - private Integer theoreticalExamScore; + private Float theoreticalExamScore; /** * 实操考试分值 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingDetailVO.java index 87a66ad13..5602867cd 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingDetailVO.java @@ -130,7 +130,7 @@ public class EmployeeTrainingDetailVO { * 理论考试分值 */ @ApiModelProperty("理论考试分值") - private Integer theoreticalExamScore; + private Float theoreticalExamScore; /** * 实操考试状态 0-未开始 1-合格 2-不合格 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingVO.java index 7c95e6ba1..41cc8055f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingVO.java @@ -55,7 +55,7 @@ public class EmployeeTrainingVO { private Integer theoreticalExamStatus; @ApiModelProperty("理论考试分值") - private Integer theoreticalExamScore; + private Float theoreticalExamScore; @ApiModelProperty("实操考试状态 0-未开始 1-合格 2-不合格") private Integer practicalExamStatus; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java index 49286934f..58287a752 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java @@ -18,6 +18,7 @@ import com.cool.store.enums.video.UploadTypeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.*; import com.cool.store.service.*; +import com.cool.store.utils.NumberConverter; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.poi.DateUtils; import com.cool.store.utils.vod.SmallVideoParam; @@ -199,7 +200,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { StaffExamInfoDTO staffExamInfoDTO = xfsgEhrService.getUserExamInfo(enterpriseUserDO.getJobnumber()); if (staffExamInfoDTO != null && StringUtils.isNotBlank(staffExamInfoDTO.getExamResult()) && StringUtils.isNotBlank(staffExamInfoDTO.getExamScore())) { - employeeTrainingVO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? Integer.valueOf(staffExamInfoDTO.getExamScore()) : null); + employeeTrainingVO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? NumberConverter.convertMath(staffExamInfoDTO.getExamScore()) : null); employeeTrainingVO.setTheoreticalExamStatus(ExamStatusEnum.matchCodeByDesc(staffExamInfoDTO.getExamResult())); if(!employeeTrainingVO.getTheoreticalExamScore().equals(employeeTrainingDO.getTheoreticalExamScore()) || !employeeTrainingVO.getTheoreticalExamStatus().equals(employeeTrainingDO.getTheoreticalExamStatus())){ @@ -501,7 +502,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { StaffExamInfoDTO staffExamInfoDTO = xfsgEhrService.getUserExamInfo(enterpriseUserDO.getJobnumber()); if (staffExamInfoDTO != null && StringUtils.isNotBlank(staffExamInfoDTO.getExamResult()) && StringUtils.isNotBlank(staffExamInfoDTO.getExamScore())) { - assessmentUserTrainingVO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? Integer.valueOf(staffExamInfoDTO.getExamScore()) : null); + assessmentUserTrainingVO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? NumberConverter.convertMath(staffExamInfoDTO.getExamScore()) : null); assessmentUserTrainingVO.setTheoreticalExamStatus(ExamStatusEnum.matchCodeByDesc(staffExamInfoDTO.getExamResult())); if(!assessmentUserTrainingVO.getTheoreticalExamScore().equals(employeeTrainingDO.getTheoreticalExamScore()) || !assessmentUserTrainingVO.getTheoreticalExamStatus().equals(employeeTrainingDO.getTheoreticalExamStatus())){ @@ -644,7 +645,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { StaffExamInfoDTO staffExamInfoDTO = xfsgEhrService.getUserExamInfo(enterpriseUserDO.getJobnumber()); if (staffExamInfoDTO != null && StringUtils.isNotBlank(staffExamInfoDTO.getExamResult()) && StringUtils.isNotBlank(staffExamInfoDTO.getExamScore())) { - employeeTrainingDO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? Integer.valueOf(staffExamInfoDTO.getExamScore()) : null); + employeeTrainingDO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? NumberConverter.convertMath(staffExamInfoDTO.getExamScore()) : null); employeeTrainingDO.setTheoreticalExamStatus(ExamStatusEnum.matchCodeByDesc(staffExamInfoDTO.getExamResult())); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index 7493270ba..5a3a54ded 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -21,6 +21,7 @@ import com.cool.store.response.xfsgFirstOderListResponse; import com.cool.store.service.*; import com.cool.store.service.impl.CommonService; import com.cool.store.utils.CoolDateUtils; +import com.cool.store.utils.NumberConverter; import com.cool.store.utils.poi.DateUtils; import com.cool.store.utils.poi.StringUtils; import com.cool.store.utils.poi.constant.Constants; @@ -486,7 +487,7 @@ public class XxlJobHandler { StaffExamInfoDTO staffExamInfoDTO = xfsgEhrService.getUserExamInfo(enterpriseUserDO.getJobnumber()); if (staffExamInfoDTO != null && StringUtils.isNotBlank(staffExamInfoDTO.getExamResult()) && StringUtils.isNotBlank(staffExamInfoDTO.getExamScore())) { - employeeTrainingDO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? Integer.valueOf(staffExamInfoDTO.getExamScore()) : null); + employeeTrainingDO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? NumberConverter.convertMath(staffExamInfoDTO.getExamScore()) : null); employeeTrainingDO.setTheoreticalExamStatus(ExamStatusEnum.matchCodeByDesc(staffExamInfoDTO.getExamResult())); employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO); }