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

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

@@ -15,7 +15,7 @@ import java.util.List;
 public interface PoliceStationApplyReasonMapper {
 
     @Select("SELECT SUBSTR(B.UPLOAD_NO,0,9) police_station_code,B.DRAW_TYPE,count(b.UPLOAD_NO) apply_count from GROUP_NO a\n" +
-            "  LEFT JOIN  PROD_APPLY_INFO_T@prodYD_LINK b ON a.GROUP_NO=substr(b.ACCEPT_NO,0,8)\n" +
+            "  LEFT JOIN  PROD_DBA.PROD_APPLY_INFO_T@PRODYD_LINK b ON a.GROUP_NO=substr(b.ACCEPT_NO,0,8)\n" +
             "WHERE TASK_ID=#{taskId} GROUP BY SUBSTR(B.UPLOAD_NO,0,9),B.DRAW_TYPE")
     public List<PoliceApplyCountDto> getPoliceStationApplyReason(@Param("taskId") String taskId);
 

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

@@ -31,7 +31,7 @@ public interface TaskListMapper {
             "order by ACC_GROUP_T.group_no")
     public List<Map<String,Object>> selectByCountyAtACCU(@Param("submitDate") String submitDate);
 
-    @Select("select DISTINCT CARD_TYPE_DIC.*, PROD_GROUP_T.* ,'000000' COUNTY_CODE,'0000' COUNTYNAME,'3' DEAL_FLAG, '00000000' USER_CODE from PROD_CARD_T@PRODYD_LINK \n" +
+    @Select("select DISTINCT CARD_TYPE_DIC.*, PROD_GROUP_T.* ,'000000' COUNTY_CODE,'0000' COUNTYNAME,'3' DEAL_FLAG, '00000000' USER_CODE from PRODYD_DBA.PROD_CARD_T@PRODYD_LINK \n" +
             "left join PRODYD_DBA.PROD_GROUP_T@PRODYD_LINK on substr(prod_card_t.accept_no,0,8) = prod_GROUP_T.group_no\n" +
             "left join PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_RELATION_T.group_no =PROD_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" +