Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -1085,31 +1085,20 @@ public class CzrkServiceImpl implements ICzrkService {
         setAgeScope(czrk);
         List<Czrk> czrkList = czrkMapper.getAllCzrk(czrk);
 
-        List<Czrk> czrkListp = czrkList.stream().sorted(
+       /* List<Czrk> czrkListp = czrkList.stream().sorted(
                 //以户籍号排序
                 Comparator.comparing(Czrk::getCode, Comparator.reverseOrder())
                         //户主排序
                         .thenComparing(Czrk::getHouseType, Comparator.reverseOrder())
 
-        ).collect(Collectors.toList());
+        ).collect(Collectors.toList());*/
 
-
-       /* List<TestInfo> sortList = testInfos.stream().sorted(
-                // 以上月评分排序，评分高的在前
-                Comparator.comparing(TestInfo::getLastScore, Comparator.reverseOrder())
-                        // 以在司时长排序，时间长的在前
-                        .thenComparing(TestInfo::getOnJobMonth, Comparator.reverseOrder())
-                        // 以评分排序，评分高的在前
-                        .thenComparing(TestInfo::getScore, Comparator.reverseOrder())).collect(Collectors.toList());
-        sortList.forEach(System.out::println);*/
-
-
-        CzrkUtils.packAddr(czrkListp);
-        if(czrkListp==null || czrkListp.size()<=0){
+        CzrkUtils.packAddr(czrkList);
+        if(czrkList==null || czrkList.size()<=0){
             throw new BaseException("请下载属于本乡镇数据");
         }
         //packAddr(czrkList);
-        return czrkListp;
+        return czrkList;
     }
 
     @Override

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -1203,7 +1203,7 @@
             <if test="villageTownsIdXjd != null">and cj.town_id = #{villageTownsIdXjd}</if>
             <if test="villageIdXjd != null">and cj.village_id = #{villageIdXjd}</if>
         </where>
-        GROUP BY c.id_card
+        order by c.code ,c.house_type desc,c.id_card;
     </select>