修改查询创建任务单

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

@@ -36,13 +36,14 @@ public interface TaskListMapper {
      * @return
      */
     @Select("select DISTINCT CARD_TYPE_DIC.*, ACC_GROUP_T.* ,county_dic.* from ACC_CARD_T@ACCU_LINK \n" +
-            "left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = acc_card_t.upload_no \n" +
             "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 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} order by ACC_GROUP_T.group_no")
+            "left join ACC_GROUP_RELATION_T@ACCU_LINK on ACC_GROUP_RELATION_T.group_no =ACC_GROUP_T.group_no\n" +
+            "left join CARD_TYPE_DIC on decode(substr(ORIGINAL_NO,3,2),'99',6,substr(ORIGINAL_NO,21,1)) =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "left join county_dic on substr(acc_card_t.upload_no,0,6)=  county_dic.COUNTY_CODE\n" +
+            "where county_dic.COUNTY_CODE is not null \n" +
+            "and ACC_GROUP_T.group_no not in (select group_no from group_no)\n" +
+            "and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{submitDate} \n" +
+            "order by ACC_GROUP_T.group_no")
     public List<Map<String,Object>> selectByCountyAtACCU(@Param("submitDate") String submitDate);
 
     /**
@@ -724,7 +725,7 @@ public interface TaskListMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE \n" +
             "left join RECEIPT_LIST on SPECIAL_CARD.ACCEPT_NO = RECEIPT_LIST.QR_CODE\n" +
-            "where SPECIAL_CARD.SPECIAL_TYPE =1 and SUBMIT_DATE =#{date}   group by SORTING_DATE, SORTING_NAME, task.task_id, task.COUNTY_CODE, task.SUBMIT_DATE, \n" +
+            "where SPECIAL_CARD.SPECIAL_TYPE =1 and to_char(SUBMIT_DATE,'yyyyMMdd') =#{date}   group by SORTING_DATE, SORTING_NAME, task.task_id, task.COUNTY_CODE, task.SUBMIT_DATE, \n" +
             "task.SUBMIT_NAME, task.ISSUED_DATE, task.ISSUED_NAME, task.PRINT_OUT_DATE, task.PRINT_OUT_NAME, \n" +
             "task.POSITION_DATE, task.POSITION_NAME, task.CONCORA_CRUSH_DATE, task.CONCORA_CRUSH_NAME, TASK.PUNCHING_DATE, \n" +
             "TASK.PUNCHING_NAME, '余证', '99', COUNTY_DIC.COUNTYNAME, 1, \n" +