BJ_FS / urbanops

Commit c3c48b973e2d9c25972abe14068b00c35c141060

Authored by 王彪总
1 parent 8574ecef

feat(garden): 扩展养护计划周期类型支持 

- 新增周期ID选项：5(按次)、6(季度)、7(半年)
- 更新维护计划服务以支持新周期类型校验
- 修改时间间隔工具类以适配新增周期计算逻辑
- 引入字典数据API用于周期类型验证
- 调整按次计划的特殊处理逻辑
- 更新相关文档描述和示例代码
Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java
  View file @c3c48b9
@@ -48,8 +48,8 @@ public class InspectionPlanSaveReqVO { @@ -48,8 +48,8 @@ public class InspectionPlanSaveReqVO {
48 @NotEmpty(message = "频次值不能为空") 48 @NotEmpty(message = "频次值不能为空")
49 private String rateValue; 49 private String rateValue;
50 50
51 - @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")  
52 - @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次不能为空") 51 + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次；5:按次；6:季度；7:半年", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  52 + @NotNull(message = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次；5:按次；6:季度；7:半年")
53 private Integer cycleId; 53 private Integer cycleId;
54 54
55 @Schema(description = "开始时间") 55 @Schema(description = "开始时间")
@@ -69,4 +69,4 @@ public class InspectionPlanSaveReqVO { @@ -69,4 +69,4 @@ public class InspectionPlanSaveReqVO {
69 public boolean verify(){ 69 public boolean verify(){
70 return StringValidateUtil.validate(rateValue); 70 return StringValidateUtil.validate(rateValue);
71 } 71 }
72 -}  
73 \ No newline at end of file 72 \ No newline at end of file
  73 +}
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
  View file @c3c48b9
@@ -100,7 +100,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { @@ -100,7 +100,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
100 //计算计划次数 100 //计算计划次数
101 int planNum; 101 int planNum;
102 //临时计划 102 //临时计划
103 - if (createReqVO.getPlanAttr().equals(2)) { 103 + if (createReqVO.getCycleId().equals(5)) {
104 calculate = new ArrayList<>(); 104 calculate = new ArrayList<>();
105 PeriodResult periodResult = new PeriodResult(createReqVO.getBeginTime(), createReqVO.getEndTime(), Integer.parseInt(createReqVO.getRateValue())); 105 PeriodResult periodResult = new PeriodResult(createReqVO.getBeginTime(), createReqVO.getEndTime(), Integer.parseInt(createReqVO.getRateValue()));
106 calculate.add(periodResult); 106 calculate.add(periodResult);
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
  View file @c3c48b9
@@ -116,7 +116,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { @@ -116,7 +116,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
116 int planNum; 116 int planNum;
117 //按次计划 117 //按次计划
118 dictDataApi.validateDictDataList(DICT_TYPE_CYCLE_ID, Collections.singleton(createReqVO.getCycleId().toString().trim())); 118 dictDataApi.validateDictDataList(DICT_TYPE_CYCLE_ID, Collections.singleton(createReqVO.getCycleId().toString().trim()));
119 - if (createReqVO.getCycleId().equals(1)) { 119 + if (createReqVO.getCycleId().equals(5)) {
120 calculate = new ArrayList<>(); 120 calculate = new ArrayList<>();
121 PeriodResult periodResult = new PeriodResult(createReqVO.getBeginTime(), createReqVO.getEndTime(), Integer.parseInt(createReqVO.getRateValue())); 121 PeriodResult periodResult = new PeriodResult(createReqVO.getBeginTime(), createReqVO.getEndTime(), Integer.parseInt(createReqVO.getRateValue()));
122 calculate.add(periodResult); 122 calculate.add(periodResult);