From d481985603689ed47b42fad5a365b699f49e724a Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Tue, 14 Mar 2023 17:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=91=E6=96=87=E5=8E=9F=E6=96=87=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=88=E6=A0=A1=E9=AA=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   | 296 ++++++++++--------
 1 file changed, 159 insertions(+), 137 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index f527f945..d1e9d797 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2793,32 +2793,33 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                 //证明找到文件名称一致的了
                                                                 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                                                 //原文译文 进行判断
-                                                                if (sortSign.getSortSign().contains("译")) {
-                                                                    if (StringUtils.isNotBlank(yi)) {
-                                                                        yi = "," + fileId;
+                                                                if(sortSign != null) {
+                                                                    if (sortSign.getSortSign().contains("译")) {
+                                                                        if (StringUtils.isNotBlank(yi)) {
+                                                                            yi = "," + fileId;
+                                                                        } else {
+                                                                            yi = fileId;
+                                                                        }
                                                                     } else {
-                                                                        yi = fileId;
+                                                                        if (StringUtils.isNotBlank(yuan)) {
+                                                                            yuan = "," + fileId;
+                                                                        } else {
+                                                                            yuan = fileId;
+                                                                        }
                                                                     }
-                                                                } else {
-                                                                    if (StringUtils.isNotBlank(yuan)) {
-                                                                        yuan = "," + fileId;
-                                                                    } else {
-                                                                        yuan = fileId;
-                                                                    }
-
                                                                 }
+
                                                             }
                                                         }
                                                     } else {
                                                         //记录 同一条数据名称一样的
                                                         for (AttFileEO fileEO : attFileEOS) {
-                                                            fileEO.setResId("h-" + SarStandardsInfo.getStandId());
+                                                            fileEO.setResId(SarStandardsInfo.getStandId());
                                                             fileEOArrayList.add(fileEO);
                                                         }
                                                     }
                                                 }
                                             }else {
-                                                //循环调用每一个 文件 获取文件名称
                                                 String id = SarStandardsInfo.getFileId();
                                                 AttFileEO byId = attFileEOService.getFileInfo(id);
                                                 String theSame = isTheSame(byId.getOldFileName(), bid);
@@ -2826,19 +2827,20 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                     //证明找到文件名称一致的了
                                                     OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                                     //原文译文 进行判断
-                                                    if (sortSign.getSortSign().contains("译")) {
-                                                        if (StringUtils.isNotBlank(yi)) {
-                                                            yi = "," + SarStandardsInfo.getFileId();
+                                                    if(sortSign != null) {
+                                                        if (sortSign.getSortSign().contains("译")) {
+                                                            if (StringUtils.isNotBlank(yi)) {
+                                                                yi = "," + SarStandardsInfo.getFileId();
+                                                            } else {
+                                                                yi = SarStandardsInfo.getFileId();
+                                                            }
                                                         } else {
-                                                            yi = SarStandardsInfo.getFileId();
+                                                            if (StringUtils.isNotBlank(yuan)) {
+                                                                yuan = "," + SarStandardsInfo.getFileId();
+                                                            } else {
+                                                                yuan = SarStandardsInfo.getFileId();
+                                                            }
                                                         }
-                                                    } else {
-                                                        if (StringUtils.isNotBlank(yuan)) {
-                                                            yuan = "," + SarStandardsInfo.getFileId();
-                                                        } else {
-                                                            yuan = SarStandardsInfo.getFileId();
-                                                        }
-
                                                     }
                                                 }
                                             }
@@ -2868,26 +2870,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                         //证明找到文件名称一致的了
                                                         OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                                         //原文译文 进行判断
-                                                        if (sortSign.getSortSign().contains("译")) {
-                                                            if (StringUtils.isNotBlank(yi)) {
-                                                                yi = "," + fileId;
+                                                        if(sortSign != null) {
+                                                            if (sortSign.getSortSign().contains("译")) {
+                                                                if (StringUtils.isNotBlank(yi)) {
+                                                                    yi = "," + fileId;
+                                                                } else {
+                                                                    yi = fileId;
+                                                                }
                                                             } else {
-                                                                yi = fileId;
-                                                            }
-                                                        } else {
-                                                            if (StringUtils.isNotBlank(yuan)) {
-                                                                yuan = "," + fileId;
-                                                            } else {
-                                                                yuan = fileId;
-                                                            }
+                                                                if (StringUtils.isNotBlank(yuan)) {
+                                                                    yuan = "," + fileId;
+                                                                } else {
+                                                                    yuan = fileId;
+                                                                }
 
+                                                            }
                                                         }
                                                     }
                                                 }
                                             } else {
                                                 //记录 同一条数据名称一样的
                                                 for (AttFileEO fileEO : attFileEOS) {
-                                                    fileEO.setResId("h-" + SarStandardsInfo.getStandId());
+                                                    fileEO.setResId(SarStandardsInfo.getStandId());
                                                     fileEOArrayList.add(fileEO);
                                                 }
                                             }
@@ -2901,17 +2905,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                             //证明找到文件名称一致的了
                                             OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                             //原文译文 进行判断
-                                            if (sortSign.getSortSign().contains("译")) {
-                                                if (StringUtils.isNotBlank(yi)) {
-                                                    yi = "," + SarStandardsInfo.getFileId();
+                                            if(sortSign != null) {
+                                                if (sortSign.getSortSign().contains("译")) {
+                                                    if (StringUtils.isNotBlank(yi)) {
+                                                        yi = "," + SarStandardsInfo.getFileId();
+                                                    } else {
+                                                        yi = SarStandardsInfo.getFileId();
+                                                    }
                                                 } else {
-                                                    yi = SarStandardsInfo.getFileId();
-                                                }
-                                            } else {
-                                                if (StringUtils.isNotBlank(yuan)) {
-                                                    yuan = "," + SarStandardsInfo.getFileId();
-                                                } else {
-                                                    yuan = SarStandardsInfo.getFileId();
+                                                    if (StringUtils.isNotBlank(yuan)) {
+                                                        yuan = "," + SarStandardsInfo.getFileId();
+                                                    } else {
+                                                        yuan = SarStandardsInfo.getFileId();
+                                                    }
                                                 }
                                             }
                                         }
@@ -2980,26 +2986,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                             //证明找到文件名称一致的了
                                                             OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                                             //原文译文 进行判断
-                                                            if (sortSign.getSortSign().contains("译")) {
-                                                                if (StringUtils.isNotBlank(yi)) {
-                                                                    yi = "," + fileId;
+                                                            if(sortSign != null) {
+                                                                if (sortSign.getSortSign().contains("译")) {
+                                                                    if (StringUtils.isNotBlank(yi)) {
+                                                                        yi = "," + fileId;
+                                                                    } else {
+                                                                        yi = fileId;
+                                                                    }
                                                                 } else {
-                                                                    yi = fileId;
-                                                                }
-                                                            } else {
-                                                                if (StringUtils.isNotBlank(yuan)) {
-                                                                    yuan = "," + fileId;
-                                                                } else {
-                                                                    yuan = fileId;
-                                                                }
+                                                                    if (StringUtils.isNotBlank(yuan)) {
+                                                                        yuan = "," + fileId;
+                                                                    } else {
+                                                                        yuan = fileId;
+                                                                    }
 
+                                                                }
                                                             }
                                                         }
                                                     }
                                                 } else {
                                                     //记录 同一条数据名称一样的
                                                     for (AttFileEO fileEO : attFileEOS) {
-                                                        fileEO.setResId("h-" + SarStandardsInfo.getStandId());
+                                                        fileEO.setResId(SarStandardsInfo.getStandId());
                                                         fileEOArrayList.add(fileEO);
                                                     }
                                                 }
@@ -3013,19 +3021,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 //证明找到文件名称一致的了
                                                 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                                 //原文译文 进行判断
-                                                if (sortSign.getSortSign().contains("译")) {
-                                                    if (StringUtils.isNotBlank(yi)) {
-                                                        yi = "," + SarStandardsInfo.getFileId();
+                                                if(sortSign != null) {
+                                                    if (sortSign.getSortSign().contains("译")) {
+                                                        if (StringUtils.isNotBlank(yi)) {
+                                                            yi = "," + SarStandardsInfo.getFileId();
+                                                        } else {
+                                                            yi = SarStandardsInfo.getFileId();
+                                                        }
                                                     } else {
-                                                        yi = SarStandardsInfo.getFileId();
-                                                    }
-                                                } else {
-                                                    if (StringUtils.isNotBlank(yuan)) {
-                                                        yuan = "," + SarStandardsInfo.getFileId();
-                                                    } else {
-                                                        yuan = SarStandardsInfo.getFileId();
-                                                    }
+                                                        if (StringUtils.isNotBlank(yuan)) {
+                                                            yuan = "," + SarStandardsInfo.getFileId();
+                                                        } else {
+                                                            yuan = SarStandardsInfo.getFileId();
+                                                        }
 
+                                                    }
                                                 }
                                             }
                                         }
@@ -3055,26 +3065,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                     //证明找到文件名称一致的了
                                                     OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                                     //原文译文 进行判断
-                                                    if (sortSign.getSortSign().contains("译")) {
-                                                        if (StringUtils.isNotBlank(yi)) {
-                                                            yi = "," + fileId;
+                                                    if(sortSign != null) {
+                                                        if (sortSign.getSortSign().contains("译")) {
+                                                            if (StringUtils.isNotBlank(yi)) {
+                                                                yi = "," + fileId;
+                                                            } else {
+                                                                yi = fileId;
+                                                            }
                                                         } else {
-                                                            yi = fileId;
-                                                        }
-                                                    } else {
-                                                        if (StringUtils.isNotBlank(yuan)) {
-                                                            yuan = "," + fileId;
-                                                        } else {
-                                                            yuan = fileId;
-                                                        }
+                                                            if (StringUtils.isNotBlank(yuan)) {
+                                                                yuan = "," + fileId;
+                                                            } else {
+                                                                yuan = fileId;
+                                                            }
 
+                                                        }
                                                     }
                                                 }
                                             }
                                         } else {
                                             //记录 同一条数据名称一样的
                                             for (AttFileEO fileEO : attFileEOS) {
-                                                fileEO.setResId("h-" + SarStandardsInfo.getStandId());
+                                                fileEO.setResId(SarStandardsInfo.getStandId());
                                                 fileEOArrayList.add(fileEO);
                                             }
                                         }
@@ -3088,17 +3100,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         //证明找到文件名称一致的了
                                         OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                         //原文译文 进行判断
-                                        if (sortSign.getSortSign().contains("译")) {
-                                            if (StringUtils.isNotBlank(yi)) {
-                                                yi = "," + SarStandardsInfo.getFileId();
+                                        if(sortSign != null) {
+                                            if (sortSign.getSortSign().contains("译")) {
+                                                if (StringUtils.isNotBlank(yi)) {
+                                                    yi = "," + SarStandardsInfo.getFileId();
+                                                } else {
+                                                    yi = SarStandardsInfo.getFileId();
+                                                }
                                             } else {
-                                                yi = SarStandardsInfo.getFileId();
-                                            }
-                                        } else {
-                                            if (StringUtils.isNotBlank(yuan)) {
-                                                yuan = "," + SarStandardsInfo.getFileId();
-                                            } else {
-                                                yuan = SarStandardsInfo.getFileId();
+                                                if (StringUtils.isNotBlank(yuan)) {
+                                                    yuan = "," + SarStandardsInfo.getFileId();
+                                                } else {
+                                                    yuan = SarStandardsInfo.getFileId();
+                                                }
                                             }
                                         }
                                     }
@@ -3169,19 +3183,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                 //证明找到文件名称一致的了
                                                                 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                                                 //原文译文 进行判断
-                                                                if (sortSign.getSortSign().contains("译")) {
-                                                                    if (StringUtils.isNotBlank(yi)) {
-                                                                        yi = "," + fileId;
+                                                                if(sortSign != null) {
+                                                                    if (sortSign.getSortSign().contains("译")) {
+                                                                        if (StringUtils.isNotBlank(yi)) {
+                                                                            yi = "," + fileId;
+                                                                        } else {
+                                                                            yi = fileId;
+                                                                        }
                                                                     } else {
-                                                                        yi = fileId;
-                                                                    }
-                                                                } else {
-                                                                    if (StringUtils.isNotBlank(yuan)) {
-                                                                        yuan = "," + fileId;
-                                                                    } else {
-                                                                        yuan = fileId;
-                                                                    }
+                                                                        if (StringUtils.isNotBlank(yuan)) {
+                                                                            yuan = "," + fileId;
+                                                                        } else {
+                                                                            yuan = fileId;
+                                                                        }
 
+                                                                    }
                                                                 }
                                                             }
                                                         }
@@ -3189,7 +3205,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                         //记录 同一条数据名称一样的
                                                         for (AttFileEO fileEO:attFileEOS) {
                                                             //记录重复 此id企业或者海外的id
-                                                            fileEO.setResId("q-"+sarBussionessStand.getStandId());
+                                                            fileEO.setResId(sarBussionessStand.getStandId());
                                                             fileEOArrayList.add(fileEO);
                                                         }
                                                     }
@@ -3204,19 +3220,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                     //证明找到文件名称一致的了
                                                     OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                                     //原文译文 进行判断
-                                                    if (sortSign.getSortSign().contains("译")) {
-                                                        if (StringUtils.isNotBlank(yi)) {
-                                                            yi = "," + sarBussionessStand.getFileId();
+                                                    if(sortSign != null) {
+                                                        if (sortSign.getSortSign().contains("译")) {
+                                                            if (StringUtils.isNotBlank(yi)) {
+                                                                yi = "," + sarBussionessStand.getFileId();
+                                                            } else {
+                                                                yi = sarBussionessStand.getFileId();
+                                                            }
                                                         } else {
-                                                            yi = sarBussionessStand.getFileId();
-                                                        }
-                                                    } else {
-                                                        if (StringUtils.isNotBlank(yuan)) {
-                                                            yuan = "," + sarBussionessStand.getFileId();
-                                                        } else {
-                                                            yuan = sarBussionessStand.getFileId();
-                                                        }
+                                                            if (StringUtils.isNotBlank(yuan)) {
+                                                                yuan = "," + sarBussionessStand.getFileId();
+                                                            } else {
+                                                                yuan = sarBussionessStand.getFileId();
+                                                            }
 
+                                                        }
                                                     }
                                                 }
                                             }
@@ -3246,19 +3264,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                         //证明找到文件名称一致的了
                                                         OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                                         //原文译文 进行判断
-                                                        if (sortSign.getSortSign().contains("译")) {
-                                                            if (StringUtils.isNotBlank(yi)) {
-                                                                yi = "," + fileId;
+                                                        if(sortSign != null) {
+                                                            if (sortSign.getSortSign().contains("译")) {
+                                                                if (StringUtils.isNotBlank(yi)) {
+                                                                    yi = "," + fileId;
+                                                                } else {
+                                                                    yi = fileId;
+                                                                }
                                                             } else {
-                                                                yi = fileId;
-                                                            }
-                                                        } else {
-                                                            if (StringUtils.isNotBlank(yuan)) {
-                                                                yuan = "," + fileId;
-                                                            } else {
-                                                                yuan = fileId;
-                                                            }
+                                                                if (StringUtils.isNotBlank(yuan)) {
+                                                                    yuan = "," + fileId;
+                                                                } else {
+                                                                    yuan = fileId;
+                                                                }
 
+                                                            }
                                                         }
                                                     }
                                                 }
@@ -3266,7 +3286,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 //记录 同一条数据名称一样的
                                                 for (AttFileEO fileEO : attFileEOS) {
                                                     //记录重复 此id企业或者海外的id
-                                                    fileEO.setResId("q-" + sarBussionessStand.getStandId());
+                                                    fileEO.setResId(sarBussionessStand.getStandId());
                                                     fileEOArrayList.add(fileEO);
                                                 }
                                             }
@@ -3280,19 +3300,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                             //证明找到文件名称一致的了
                                             OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
                                             //原文译文 进行判断
-                                            if (sortSign.getSortSign().contains("译")) {
-                                                if (StringUtils.isNotBlank(yi)) {
-                                                    yi = "," + sarBussionessStand.getFileId();
+                                            if(sortSign != null) {
+                                                if (sortSign.getSortSign().contains("译")) {
+                                                    if (StringUtils.isNotBlank(yi)) {
+                                                        yi = "," + sarBussionessStand.getFileId();
+                                                    } else {
+                                                        yi = sarBussionessStand.getFileId();
+                                                    }
                                                 } else {
-                                                    yi = sarBussionessStand.getFileId();
-                                                }
-                                            } else {
-                                                if (StringUtils.isNotBlank(yuan)) {
-                                                    yuan = "," + sarBussionessStand.getFileId();
-                                                } else {
-                                                    yuan = sarBussionessStand.getFileId();
-                                                }
+                                                    if (StringUtils.isNotBlank(yuan)) {
+                                                        yuan = "," + sarBussionessStand.getFileId();
+                                                    } else {
+                                                        yuan = sarBussionessStand.getFileId();
+                                                    }
 
+                                                }
                                             }
                                         }
                                     }