Commit 13ef8729807e08977680e13f74247be9335dab7c
1 parent
fc922b69
优化计算时间间隔天数
Showing
2 changed files
with
4 additions
and
4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
| @@ -80,9 +80,9 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { | @@ -80,9 +80,9 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { | ||
| 80 | String userName = SecurityFrameworkUtils.getLoginUserNickname(); | 80 | String userName = SecurityFrameworkUtils.getLoginUserNickname(); |
| 81 | String rateValue; | 81 | String rateValue; |
| 82 | if (createReqVO.getRateValue().contains("/")) { | 82 | if (createReqVO.getRateValue().contains("/")) { |
| 83 | - rateValue = createReqVO.getRateValue(); | 83 | + rateValue = createReqVO.getRateValue().trim(); |
| 84 | } else { | 84 | } else { |
| 85 | - rateValue = createReqVO.getRateValue()+"/1"; | 85 | + rateValue = createReqVO.getRateValue().trim()+"/1"; |
| 86 | } | 86 | } |
| 87 | //计算开始和计算时间 在间隔周期下每天的次数 | 87 | //计算开始和计算时间 在间隔周期下每天的次数 |
| 88 | List<PeriodResult> calculate = TimeIntervalFrequencyUtil.calculate(createReqVO.getBeginTime().toString(), createReqVO.getEndTime().toString(), rateValue, createReqVO.getCycleId()); | 88 | List<PeriodResult> calculate = TimeIntervalFrequencyUtil.calculate(createReqVO.getBeginTime().toString(), createReqVO.getEndTime().toString(), rateValue, createReqVO.getCycleId()); |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
| @@ -83,9 +83,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { | @@ -83,9 +83,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { | ||
| 83 | String userName = SecurityFrameworkUtils.getLoginUserNickname(); | 83 | String userName = SecurityFrameworkUtils.getLoginUserNickname(); |
| 84 | String rateValue; | 84 | String rateValue; |
| 85 | if (createReqVO.getRateValue().contains("/")) { | 85 | if (createReqVO.getRateValue().contains("/")) { |
| 86 | - rateValue = createReqVO.getRateValue(); | 86 | + rateValue = createReqVO.getRateValue().trim(); |
| 87 | } else { | 87 | } else { |
| 88 | - rateValue = createReqVO.getRateValue()+"/1"; | 88 | + rateValue = createReqVO.getRateValue().trim()+"/1"; |
| 89 | } | 89 | } |
| 90 | //计算开始和计算时间 在间隔周期下每天的次数 | 90 | //计算开始和计算时间 在间隔周期下每天的次数 |
| 91 | //计算开始和计算时间 在间隔周期下每天的次数 | 91 | //计算开始和计算时间 在间隔周期下每天的次数 |