Ver Fonte

feat: 回显打卡距离

shc há 8 meses atrás
pai
commit
51b14dadc0

+ 14 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -2958,7 +2958,20 @@ public class ApiController {
                 map.put("signEntName", wmDaHospital.getYymc());
                 map.put("longitude", wmDaHospital.getLongitude());
                 map.put("latitude", wmDaHospital.getLatitude());
-                map.put("distance", wmDaHospital.getDistance());
+                Double distance = wmDaHospital.getDistance();
+                String dis;
+
+                if(distance == null){
+                    dis = "--m";
+                } else {
+                    if (distance < 1.00) {
+                        dis = String.format("%dm", (int) (distance * 1000.0));
+                    } else {
+                        dis = String.format("%.2fkm", distance);
+                    }
+                }
+
+                map.put("dis", dis);
                 map.put("signEntType", "1");
                 mapList.add(map);
             }

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmDaHospitalMapper.xml

@@ -39,7 +39,7 @@
     <result property="createUser" column="create_user"/>
     <result property="updateTime" column="update_time"/>
     <result property="updateUser" column="update_user"/>
-    <result property="distance" column="dis"/>
+    <result property="distance" column="distance"/>
   </resultMap>
 
   <!-- 根据经纬度获取指定范围内数据 -->