|
@@ -231,11 +231,17 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
|
|
|
// if (!verifyResult)
|
|
|
// return RestResponse.fail(MessageUtils.get("msg.longitude.error"));
|
|
|
//维保工是否在电梯附近
|
|
|
+
|
|
|
+ // TODO: 2021/3/19 暂时关闭定位点校验 bug 0.0,0.0
|
|
|
String coordinate = request.getCoordinate();
|
|
|
- boolean result = calc(liftCoordinate, coordinate);
|
|
|
- if (result) {
|
|
|
- log.info("用户签到位置大于2千米");
|
|
|
- return RestResponse.fail(MessageUtils.get("msg.error.person.scope"));
|
|
|
+ if ("0.0,0.0".equals(coordinate)) {
|
|
|
+ request.setCoordinate(liftCoordinate);
|
|
|
+ } else {
|
|
|
+ boolean result = calc(liftCoordinate, coordinate);
|
|
|
+ if (result) {
|
|
|
+ log.info("用户签到位置大于2千米");
|
|
|
+ return RestResponse.fail(MessageUtils.get("msg.error.person.scope"));
|
|
|
+ }
|
|
|
}
|
|
|
log.debug("根据全局设置判断当前维保工是否可以继续维保电梯");
|
|
|
boolean maintainable = maintenancePlanService.getBaseMapper().selectLiftMaintainableBy(request.getUserId(), request.getMtCompanyId(), DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDate.now()));
|
|
@@ -516,7 +522,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
|
|
|
|
|
|
request.getRecordImageList().forEach(entry -> {
|
|
|
MtRecordImg image = new MtRecordImg();
|
|
|
- image.setImgUrl(entry+suffix);
|
|
|
+ image.setImgUrl(entry + suffix);
|
|
|
image.setMtRecordId(record.getId());
|
|
|
imageList.add(image);
|
|
|
});
|
|
@@ -826,7 +832,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
|
|
|
for (int i = 0; i < imgs.size(); i++) {
|
|
|
MtRecordImg mri = new MtRecordImg();
|
|
|
mri.setMtRecordId(record.getId());
|
|
|
- mri.setImgUrl(imgs.get(i)+suffix);
|
|
|
+ mri.setImgUrl(imgs.get(i) + suffix);
|
|
|
mri.setSort(i);
|
|
|
mtRecordImgs.add(mri);
|
|
|
}
|