|
|
@@ -52,6 +52,7 @@
|
|
|
<result property="registeCode" column="registe_code"/>
|
|
|
<result property="orgName" column="org_name"/>
|
|
|
<result property="exercise" column="exercise"/>
|
|
|
+
|
|
|
</resultMap>
|
|
|
|
|
|
|
|
|
@@ -59,11 +60,11 @@
|
|
|
<select id="pageIndex"
|
|
|
resultMap="eartagDataIndex"
|
|
|
parameterType="com.huimv.acquisition.entity.vo.EartagParamVo" >
|
|
|
- SELECT ed1.id , ed1.eartag_no ,ed1.device_code ,ed1.time, ed1.ear_temp ,ed1.bat ,ed1.exercise ,
|
|
|
+ SELECT ed1.id , ed1.eartag_no ,ed1.device_code ,ed1.time, ed1.ear_temp ,ed1.bat ,ed1.exercise ,
|
|
|
|
|
|
ed1.env_temp ,ed1.rssi ,co.pen_name ,co.unit_name ,co.stage ,co.registe_code
|
|
|
|
|
|
- ,co.org_name ,
|
|
|
+ ,co.org_name
|
|
|
|
|
|
FROM eartag_data ed1 JOIN (
|
|
|
|
