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

src/main/java/com/yxproject/start/mapper/TaskListMapper.java

@@ -42,7 +42,7 @@ public interface TaskListMapper {
             "left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)=  county_dic.COUNTY_CODE\n" +
             "where county_dic.COUNTY_CODE is not null " +
             "and ACC_GROUP_T.group_no not in (select group_no from group_no)" +
-            " and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{submitDate}")
+            " and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{submitDate} order by ACC_GROUP_T.group_no")
     public List<Map<String,Object>> selectByCountyAtACCU(@Param("submitDate") String submitDate);
 
     /**
@@ -60,9 +60,9 @@ public interface TaskListMapper {
             "left join ACC_GROUP_T@ACCU_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no\n" +
             "left join CARD_TYPE_DIC on PREPRO_PERSON.card_type_id =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
             "left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)=  county_dic.COUNTY_CODE\n" +
-            "where county_dic.COUNTY_CODE = #{countyCode} and " +
+            "where county_dic.COUNTY_CODE = #{countyCode}  " +
             " and ACC_GROUP_T.group_no not in (select group_no from group_no) " +
-            "to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{date}" +
+            " and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{date}" +
             " and PREPRO_PERSON.card_type_id = #{typeCode}" +
             ") a ) where rn BETWEEN #{minNum} and #{maxNum}")
     public List<Map<String,Object>> selectByGroupNoAtACCU(@Param("date") String date,@Param("typeCode")String typeCode,@Param("countyCode")String countyCode,@Param("maxNum")long maxNum,@Param("minNum")long minNum );