WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
刘彦泽
2022-10-14 15:35:15 +08:00
parent e6302aa444 9b28942e5c
commit 720900752d
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+19 -19
View File
@@ -556,25 +556,25 @@ public class WordUtil {
String workProgressEn = lawsMonthlyReportWriteEO.getWorkProgressEn();//NIO工作进展英文
String lawsContactTemp = lawsMonthlyReportWriteEO.getLawsContact();//法规联系人
String lawsContact = getLawsContact(loginUserList, lawsContactTemp);
if(StringUtils.isNotEmpty(lawsContact)){
List<String> lawsContactList = Arrays.asList(lawsContact.split(","));
if (lawsContactList.size() > 4) {
StringBuilder str = new StringBuilder();
int count = 0;
for (String s : lawsContactList) {
str.append(s + ",");
count++;
if (count % 4 == 0) {
str.append("\n");
}
}
if(str.toString().endsWith("\n")){
lawsContact = str.substring(0,str.length()-2);
}else{
lawsContact = str.substring(0,str.length()-1);
}
}
}
// if(StringUtils.isNotEmpty(lawsContact)){
// List<String> lawsContactList = Arrays.asList(lawsContact.split(","));
// if (lawsContactList.size() > 4) {
// StringBuilder str = new StringBuilder();
// int count = 0;
// for (String s : lawsContactList) {
// str.append(s + ",");
// count++;
// if (count % 4 == 0) {
// str.append("\n");
// }
// }
// if(str.toString().endsWith("\n")){
// lawsContact = str.substring(0,str.length()-2);
// }else{
// lawsContact = str.substring(0,str.length()-1);
// }
// }
// }
String link = lawsMonthlyReportWriteEO.getLink();//链接
String technologyTerritoryName = "";