From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001 From: zhangfeng <1603559716@qq.com> Date: 星期三, 21 九月 2022 14:40:34 +0800 Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf --- equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java index a883d88..5658e24 100644 --- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java +++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java @@ -65,7 +65,7 @@ public ResultVO selectAll(@RequestBody PageQuery<EquipmentInfoQueryCriteria> pageQuery){ return this.equipmentInfoService.queryAll(pageQuery); } - + /** * 通过主键查询单条数据 @@ -162,7 +162,7 @@ repairDetail.setRepairEndDate(new Timestamp(new java.util.Date().getTime())); repairDetail.setRepairPersonDepartmentId(0L); repairDetail.setRepairMemo(""); - repairDetail.setRepairStatus(0); + repairDetail.setRepairStatus((byte)0); repairDetail.setExceptionInfo(""); repairDetails.add(repairDetail); infoDto.setRepaireDetailList(repairDetails); @@ -223,10 +223,10 @@ infoDto.setSetPart(""); infoDto.setProduceTime(new Timestamp(new java.util.Date().getTime())); infoDto.setUseEndDay(""); - infoDto.setLifeCycle(0); + infoDto.setLifeCycle((byte)0); infoDto.setUseDate(new Timestamp(new java.util.Date().getTime())); - infoDto.setRepairStatus(0); - infoDto.setStopStatus(0); + infoDto.setRepairStatus((byte)0); + infoDto.setStopStatus((byte)0); infoDto.setPreviousCheckDate(new Timestamp(new java.util.Date().getTime())); infoDto.setPreviousTestDate(new Timestamp(new java.util.Date().getTime())); infoDto.setPreviousTakecareDate(new Timestamp(new java.util.Date().getTime())); @@ -264,4 +264,4 @@ System.out.println(JSONObject.toJSONString(infoDto)); } -} \ No newline at end of file +} -- Gitblit v1.9.2