修改userid2

health/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: common, util-dev
+    include: common, util-test

health/src/main/resources/mapper_dao/HealthRecordDao.xml

@@ -28,7 +28,7 @@
     <select id="selectHealthInfoByDate" resultMap="resultMap_HealthInfo" parameterType="java.util.Map">
         select
             h.id as hId,
-            h.employee_id as hEmployeeId,
+            h.user_id as hEmployeeId,
             h.time as hTime,
             h.district as hDistrict,
             h.address as hAddress,
@@ -43,7 +43,7 @@
         where
             h.rec_status = 0
         and
-            h.employee_id = #{employeeId}
+            h.user_id = #{employeeId}
         and
             h.time &lt;= #{endTime}
         and
@@ -76,7 +76,7 @@
         where
             h.rec_status = 0
         and
-            h.employee_id = #{employeeId}
+            h.user_id = #{employeeId}
         and
             h.time &lt;= #{endTime}
         and
@@ -93,7 +93,7 @@
             SELECT
             count(*) as times
             FROM
-            t_employee e LEFT JOIN t_health_records r on e.id = r.employee_id
+            t_employee e LEFT JOIN t_health_records r on e.user_id = r.user_id
             where
                 r.time &lt;= #{endTime}
             and

health/src/main/resources/mapper_dao/JourneyDao.xml

@@ -15,7 +15,7 @@
     <select id="selectJourneyByDate" resultMap="resultMap_journey" parameterType="java.util.Map">
         select
             id as jId,
-            employee_id as jEmployeeId,
+            user_id as jEmployeeId,
             trip_mode as jTripMode,
             car_no as jCarNo,
             start_time as jStartTime,
@@ -27,7 +27,7 @@
         where
             rec_status = 0
         and
-            employee_id = #{employeeId}
+            user_id = #{employeeId}
         and
             start_time &lt;= #{endTime}
         and

health/src/main/resources/mapper_dao/SiteClockInDao.xml

@@ -12,7 +12,7 @@
     <select id="selectHealthInfoByDate" resultMap="resultMap_siteClick" parameterType="java.util.Map">
         select
             s.id as sId,
-            c.employee_id as sSiteName,
+            c.user_id as sSiteName,
             c.time as sTime,
             s.district as sLongitude,
             s.address as sLatitude
@@ -21,7 +21,7 @@
         where
             c.rec_status = 0
         and
-            c.employee_id = #{employeeId}
+            c.user_id = #{employeeId}
         and
             c.time &lt;= #{endTime}
         and