app养护计划明细提交

王富生
1 parent 17967f8f
Showing 9 changed files with 12 additions and 12 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.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")
@@ -70,7 +70,7 @@ public class MaintainPlanCommitRespVO {
     @Schema(description = "本次完成百分比")
     @ExcelProperty("本次完成百分比")
-    private Double finishPercent;
+    private Integer finishPercent;
     @Schema(description = "完成时间")
     @ExcelProperty("完成时间")
@@ -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不能为空")
@@ -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;
@@ -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:已完成不能为空")
@@ -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不能为空")
@@ -61,7 +61,7 @@ public class MaintainPlanCommitDO extends BaseDO {
     /**
      * 本次完成百分比
      */
-    private Double finishPercent;
+    private Integer finishPercent;
     /**
      * 照片host
      */
@@ -73,7 +73,7 @@ public class MaintainPlanDetailDO extends BaseDO {
     /**
      * 完成百分比
      */
-    private Double finishPercent;
+    private Integer finishPercent;
     /**
      * 完成状态 1:未完成;2:已完成
      */
@@ -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 -> {