diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java index fe5a445..0393e3e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java @@ -41,11 +41,11 @@ public class MaintainPlanCommitDetailRespVO { private String remark; @Schema(description = "总完成百分比", example = "98.00") - private Double totalFinishPercent; + private Integer totalFinishPercent; @Schema(description = "本次完成百分比", example = "98.00") @ExcelProperty("本次完成百分比") - private Double finishPercent; + private Integer finishPercent; @Schema(description = "照片host", example = "aaa") @ExcelProperty("照片host") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java index 798e0bd..89a2a8b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java @@ -70,7 +70,7 @@ public class MaintainPlanCommitRespVO { @Schema(description = "本次完成百分比") @ExcelProperty("本次完成百分比") - private Double finishPercent; + private Integer finishPercent; @Schema(description = "完成时间") @ExcelProperty("完成时间") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitSaveReqVO.java index 681aa45..65d15f4 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitSaveReqVO.java @@ -22,7 +22,7 @@ public class MaintainPlanCommitSaveReqVO { @Schema(description = "本次完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "本次完成百分比不能为空") - private Double finishPercent; + private Integer finishPercent; @Schema(description = "照片host", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "照片host不能为空") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java index 4ca687e..533ce94 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java @@ -46,7 +46,7 @@ public class MaintainPlanDetailPageReqVO extends PageParam { private LocalDate[] endTime; @Schema(description = "完成百分比") - private Double finishPercent; + private Integer finishPercent; @Schema(description = "完成状态 1:未完成;2:进行中;3:已完成") private Integer finishState; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java index bbac97f..e245e30 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java @@ -49,7 +49,7 @@ public class MaintainPlanDetailSaveReqVO { @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "完成百分比不能为空") - private Double finishPercent; + private Integer finishPercent; @Schema(description = "完成状态 1:未完成;2:进行中;3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "完成状态 1:未完成;2:进行中;3:已完成不能为空") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java index 21aad1a..310491a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java @@ -18,7 +18,7 @@ public class AppMaintainPlanCommitSaveReqVO { @Schema(description = "本次总完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "本次总完成百分比不能为空") - private Double totalFinishPercent; + private Integer totalFinishPercent; @Schema(description = "照片host", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "照片host不能为空") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java index ea8fa14..808497b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java @@ -61,7 +61,7 @@ public class MaintainPlanCommitDO extends BaseDO { /** * 本次完成百分比 */ - private Double finishPercent; + private Integer finishPercent; /** * 照片host */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java index 87d27e8..550b718 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java @@ -73,7 +73,7 @@ public class MaintainPlanDetailDO extends BaseDO { /** * 完成百分比 */ - private Double finishPercent; + private Integer finishPercent; /** * 完成状态 1:未完成;2:已完成 */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java index f311881..ab1d9e3 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java @@ -143,7 +143,7 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService //完成状态 1:未完成;2:已完成 int detailFinishState = 1; - if(createReqVO.getTotalFinishPercent().equals(100.00)){ + if(createReqVO.getTotalFinishPercent().equals(100)){ detailFinishState = 2; } @@ -219,11 +219,11 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService } /*2.查询明细总完成次数*/ MaintainPlanDetailDO maintainPlanDetailDO = maintainPlanDetailMapper.selectOne(MaintainPlanDetailDO::getPlanNo, planNo); - Double totalFinishPercent; + Integer totalFinishPercent; if (maintainPlanDetailDO != null) { totalFinishPercent = maintainPlanDetailDO.getFinishPercent(); } else { - totalFinishPercent = 0.0; + totalFinishPercent = 0; } /*1.查询共同处理人*/ list.forEach(e -> {