同步bug修改

bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ChartsConfigMapper.java

@@ -42,7 +42,7 @@ public interface ChartsConfigMapper {
     @Select("select DATA_NAME as name from BI_DATA_CONNECTORS where id = #{id}")
     String getDataNameById(int id);
 
-    @Select("select BD_DATA_ID from BI_CHARTS where FROM_DATA_ID = #{bd_data_id}")
+    @Select("select distinct BD_DATA_ID from BI_CHARTS where FROM_DATA_ID = #{bd_data_id}")
     Integer getDataConnectId(@Param("bd_data_id") int id);
 
     /*

bi-server/src/main/java/com/usoftchina/bi/server/dao/common/UASMapper.java

@@ -58,7 +58,7 @@ public interface UASMapper {
     @Select({ "SELECT DASHBOARD_ID dashboardId, " +
             "  ID dataSourceId, " +
             "  '_副本' lastName, " +
-            "  BD_CODE newCode " +
+            "  substr(BD_CODE,0,instr(BD_CODE, '_', 1, 2))||#{to} newCode " +
             "FROM " +
             "  (SELECT MAX(BD_CODE) BD_CODE, " +
             "    DASHBOARD_ID, " +
@@ -83,7 +83,7 @@ public interface UASMapper {
             "  ) x " +
             "WHERE X.USER_NAME = #{from} " +
             "AND REGEXP_LIKE (NVL(BD_CODE,' '), '([[:alnum:]]+_){2}')" })
-    List<DashboardCopyInfo> getFromSobDashboard(@Param("from") String from);
+    List<DashboardCopyInfo> getFromSobDashboard(@Param("from") String from,@Param("to") String to);
 
     /**
      * 查询数据链接

bi-server/src/main/java/com/usoftchina/bi/server/service/common/UASService.java

@@ -79,7 +79,7 @@ public class UASService {
         User user = userMapper.getLogin(syncData.getEmName());
         String token = jwtTokenUtil.createToke(user).getToken();
         //查找所有符合条件的Dashboard
-        List<DashboardCopyInfo> list = uasMapper.getFromSobDashboard(syncData.getFrom());
+        List<DashboardCopyInfo> list = uasMapper.getFromSobDashboard(syncData.getFrom(),syncData.getTo());
         for (  DashboardCopyInfo dashboardCopyInfo : list) {
             dashboardCopyInfo.setLastName("_" + syncData.getToName());
             dashboardCopyInfo.setDataSourceId(Integer.valueOf(to_basedata_id));
@@ -87,7 +87,7 @@ public class UASService {
             dashboardsService.copy(token,dashboardCopyInfo);
         }
         //更新标准的旧报表编号账套后缀
-        uasMapper.sp_sync(syncData.getTo(),"");
+        //uasMapper.sp_sync(syncData.getTo(),"");
         return "true";
     }
 }