admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-05-13 11:03:14 +08:00
commit 094b1eae79
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java
View File

@ -70,7 +70,7 @@ public class DangerousEngineeringSideStationController {
public Result<DangerousEngineeringSideStation> add(@RequestBody DangerousEngineeringSideStation dangerousEngineeringSideStation) {
Result<DangerousEngineeringSideStation> result = new Result<DangerousEngineeringSideStation>();
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"));

2
src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
View File

@ -240,7 +240,7 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
.between(DangerousEngineeringSideStation::getCreateTime, DateUtil.beginOfMonth(date), DateUtil.endOfMonth(date)));
Set<String> 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);