Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-business

src/main/java/com/unissoft/mapper/GrainConditionRecordMapper.xml

@@ -22,29 +22,29 @@
         id, check_time, check_list, choose, check_describe, check_person, record_status, anomalous_status, uid, houseId, depotId
     </sql>
 
-
     <select id="getByCheckPersonAndCheckTime"  resultType="com.unissoft.model.GrainConditionRecord">
-      SELECT
-			gcr.id id,
+        SELECT
+            gcr.id id,
             gcr.check_person checkPerson,
             gcr.check_time checkTime,
             gcr.check_describe checkDescribe,
             gcr.house_id houseId,
             gcr.depot_id depotId,
             gcr.record_status recordStatus,
-			gad.pest_density pestDensity,
-			gad.occur_position occurPosition,
-			gad.occur_area occurArea,
-			gad.pest_type pestType,
-			gad.abnormal_Water abnormalWater,
-			gad.abnormal_grain abnormalGrain
+            gad.pest_density pestDensity,
+            gad.occur_position occurPosition,
+            gad.occur_area occurArea,
+            gad.pest_type pestType,
+            gad.abnormal_Water abnormalWater,
+            gad.abnormal_grain abnormalGrain
         FROM
-            grain_condition_record gcr   left join grain_abnormal_describe gad on gcr.id = gad.grain_record_id
-        WHERE
-            gcr.id = ( SELECT max( id ) FROM grain_condition_record WHERE check_person = gcr.check_person )
-            and house_id = #{houseId} and depot_id = #{depotId}
+            grain_condition_record gcr
+        LEFT JOIN grain_abnormal_describe gad ON gcr.id = gad.grain_record_id
+        WHERE gcr.house_id = #{houseId}
+        AND gcr.depot_id = #{depotId}
+        GROUP BY gcr.check_person
         ORDER BY
-            gcr.check_person
+            gcr.id
     </select>
 
   <!--  <select id="getByPersonAndTime"  resultType="com.unissoft.model.GrainConditionRecord">