BJ_FS / urbanops

Commit af81ebc33f4a5921cf45bde092192d50b2a4ad52

Authored by 王富生
1 parent 17967f8f

app养护计划明细提交

Inline Side-by-side
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
  View file @af81ebc
... ... @@ -41,11 +41,11 @@ public class MaintainPlanCommitDetailRespVO {
41 41 private String remark;
42 42  
43 43 @Schema(description = "总完成百分比", example = "98.00")
44   - private Double totalFinishPercent;
  44 + private Integer totalFinishPercent;
45 45  
46 46 @Schema(description = "本次完成百分比", example = "98.00")
47 47 @ExcelProperty("本次完成百分比")
48   - private Double finishPercent;
  48 + private Integer finishPercent;
49 49  
50 50 @Schema(description = "照片host", example = "aaa")
51 51 @ExcelProperty("照片host")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java
  View file @af81ebc
... ... @@ -70,7 +70,7 @@ public class MaintainPlanCommitRespVO {
70 70  
71 71 @Schema(description = "本次完成百分比")
72 72 @ExcelProperty("本次完成百分比")
73   - private Double finishPercent;
  73 + private Integer finishPercent;
74 74  
75 75 @Schema(description = "完成时间")
76 76 @ExcelProperty("完成时间")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitSaveReqVO.java
  View file @af81ebc
... ... @@ -22,7 +22,7 @@ public class MaintainPlanCommitSaveReqVO {
22 22  
23 23 @Schema(description = "本次完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
24 24 @NotNull(message = "本次完成百分比不能为空")
25   - private Double finishPercent;
  25 + private Integer finishPercent;
26 26  
27 27 @Schema(description = "照片host", requiredMode = Schema.RequiredMode.REQUIRED)
28 28 @NotEmpty(message = "照片host不能为空")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailPageReqVO.java
  View file @af81ebc
... ... @@ -46,7 +46,7 @@ public class MaintainPlanDetailPageReqVO extends PageParam {
46 46 private LocalDate[] endTime;
47 47  
48 48 @Schema(description = "完成百分比")
49   - private Double finishPercent;
  49 + private Integer finishPercent;
50 50  
51 51 @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成")
52 52 private Integer finishState;
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailSaveReqVO.java
  View file @af81ebc
... ... @@ -49,7 +49,7 @@ public class MaintainPlanDetailSaveReqVO {
49 49  
50 50 @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
51 51 @NotNull(message = "完成百分比不能为空")
52   - private Double finishPercent;
  52 + private Integer finishPercent;
53 53  
54 54 @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
55 55 @NotNull(message = "完成状态 1:未完成;2:进行中；3:已完成不能为空")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitSaveReqVO.java
  View file @af81ebc
... ... @@ -18,7 +18,7 @@ public class AppMaintainPlanCommitSaveReqVO {
18 18  
19 19 @Schema(description = "本次总完成百分比", requiredMode = Schema.RequiredMode.REQUIRED)
20 20 @NotNull(message = "本次总完成百分比不能为空")
21   - private Double totalFinishPercent;
  21 + private Integer totalFinishPercent;
22 22  
23 23 @Schema(description = "照片host", requiredMode = Schema.RequiredMode.REQUIRED)
24 24 @NotEmpty(message = "照片host不能为空")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java
  View file @af81ebc
... ... @@ -61,7 +61,7 @@ public class MaintainPlanCommitDO extends BaseDO {
61 61 /**
62 62 * 本次完成百分比
63 63 */
64   - private Double finishPercent;
  64 + private Integer finishPercent;
65 65 /**
66 66 * 照片host
67 67 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanDetailDO.java
  View file @af81ebc
... ... @@ -73,7 +73,7 @@ public class MaintainPlanDetailDO extends BaseDO {
73 73 /**
74 74 * 完成百分比
75 75 */
76   - private Double finishPercent;
  76 + private Integer finishPercent;
77 77 /**
78 78 * 完成状态 1:未完成;2:已完成
79 79 */
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java
  View file @af81ebc
... ... @@ -143,7 +143,7 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService
143 143  
144 144 //完成状态 1:未完成;2:已完成
145 145 int detailFinishState = 1;
146   - if(createReqVO.getTotalFinishPercent().equals(100.00)){
  146 + if(createReqVO.getTotalFinishPercent().equals(100)){
147 147 detailFinishState = 2;
148 148 }
149 149  
... ... @@ -219,11 +219,11 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService
219 219 }
220 220 /*2.查询明细总完成次数*/
221 221 MaintainPlanDetailDO maintainPlanDetailDO = maintainPlanDetailMapper.selectOne(MaintainPlanDetailDO::getPlanNo, planNo);
222   - Double totalFinishPercent;
  222 + Integer totalFinishPercent;
223 223 if (maintainPlanDetailDO != null) {
224 224 totalFinishPercent = maintainPlanDetailDO.getFinishPercent();
225 225 } else {
226   - totalFinishPercent = 0.0;
  226 + totalFinishPercent = 0;
227 227 }
228 228 /*1.查询共同处理人*/
229 229 list.forEach(e -> {
... ...