diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java index 4f0d64aec..5ce8924f5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java @@ -70,7 +70,7 @@ public class DangerousEngineeringSideStationController { public Result add(@RequestBody DangerousEngineeringSideStation dangerousEngineeringSideStation) { Result result = new Result(); try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); dangerousEngineeringSideStation.setCreateTime(sdf.format(new Date())); dangerousEngineeringSideStationService.save(dangerousEngineeringSideStation); result.successMsg(MessageUtil.get("addSucess")); diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java index a01c03b3f..2441aa12e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java @@ -240,7 +240,7 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl sideList = new HashSet<>(); for (DangerousEngineeringSideStation dangerousEngineeringSideStation : list3) { - sideList.add(dangerousEngineeringSideStation.getDangerousEngineeringId() + "-" + DateUtil.format(DateUtil.parseDateTime(dangerousEngineeringSideStation.getSideStationTime()), "yyyy-MM-dd")); + sideList.add(dangerousEngineeringSideStation.getDangerousEngineeringId() + "-" + DateUtil.format(DateUtil.parseDateTime(dangerousEngineeringSideStation.getCreateTime()), "yyyy-MM-dd")); } BigDecimal bigDecima2 = new BigDecimal(list3.size()); BigDecimal result2 = new BigDecimal(0.4);