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

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml

@@ -328,7 +328,7 @@
 
     <!-- 查询员工的证件号和手机号 -->
     <select id="getEmployeeRegisterMobileAndIdCard" resultType="java.util.Map">
-        select MOBILE,ID_CARD from ic_employee_register where id = #{registerId}
+        select MOBILE,ID_CARD,NAME from ic_employee_register where id = #{registerId}
     </select>
 
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml

@@ -101,7 +101,7 @@
           </if>
           <choose>
               <when test='null != dangerLevel and dangerLevel != "" '>
-                  AND sojourn_history != #{dangerLevel}
+                  AND sojourn_history = #{dangerLevel}
               </when>
               <otherwise>
                   AND sojourn_history != '3'