合并分支 'fix_2nd_period' 到 'master'

Fix 2nd period

查看合并请求 laws-nio/laws-weilai!255

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java

@@ -29,8 +29,10 @@ import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -111,6 +113,22 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     }
                 }
             }
+
+
+            List<ProjectLibraryBase> projectLibraryBaseLinkedList = new LinkedList<>();
+            for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
+                if(StringUtils.isBlank(libraryBase.getParentId())){
+                    List<ProjectLibraryBase> projectLibraryBaseListTemp = new LinkedList<>();
+                    projectLibraryBaseListTemp.add(libraryBase);
+                    List<ProjectLibraryBase> collect = projectLibraryBaseList.stream().filter(e -> libraryBase.getId().equals(e.getParentId())).collect(Collectors.toList());
+                    if(ObjectUtils.isNotEmpty(collect)){
+                        projectLibraryBaseListTemp.addAll(collect);
+                        Collections.sort(projectLibraryBaseListTemp);
+                    }
+                    projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp);
+                }
+            }
+
             List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
             for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
                 targetMarket(projectLibraryBase, dictItemList, libraryBase);
@@ -125,7 +143,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 if(collect.size() != 0){
                     index ++;
                     mapList.put("index",index);
-                    mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket());
+                    mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+libraryBase.getProjectVersion());
                     mapList.put("data",collect);
                     result.add(mapList);
                 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java

@@ -28,35 +28,7 @@ import org.apache.poi.xwpf.usermodel.XWPFStyles;
 import org.apache.poi.xwpf.usermodel.XWPFTable;
 import org.apache.poi.xwpf.usermodel.XWPFTableCell;
 import org.apache.xmlbeans.impl.xb.xmlschema.SpaceAttribute;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTColor;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDecimalNumber;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFldChar;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFonts;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHyperlink;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTOnOff;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPageMar;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPageSz;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSectPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSpacing;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTString;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyle;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblLayoutType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcMar;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STFldCharType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STStyleType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblLayoutType;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
 
 import java.io.InputStream;
 import java.math.BigInteger;
@@ -1386,6 +1358,14 @@ public class WordUtil {
         CTR ctr = CTR.Factory.newInstance();
         CTRPr rpr = ctr.addNewRPr();
 
+        // 设置链接字体大小
+        CTHpsMeasure sz = rpr.isSetSz() ? rpr.getSz() : rpr.addNewSz();
+        sz.setVal(new BigInteger("22"));
+
+//        CTHpsMeasure szCs = rpr.isSetSzCs() ? rpr.getSzCs() : rpr
+//                .addNewSzCs();
+//        szCs.setVal(new BigInteger("11"));
+
         //设置超链接样式
         CTColor color = CTColor.Factory.newInstance();
         color.setVal("0000FF");
@@ -1400,6 +1380,8 @@ public class WordUtil {
         fonts.setHAnsi("Blue Sky Noto Regular");
 
 
+
+
         ctr.setTArray(new CTText[] { ctText });
         // Insert the linked text into the link
         cLink.setRArray(new CTR[] { ctr });

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -435,6 +435,7 @@
               standId: content[0].id,
               serialNumber: content[0].serial_number,
               title: content[0].title,
+              title_en: content[0].title_en,
               technologyTerritory: content[0].technology_territory_id
             })
             this.standardDecomposition = content
@@ -482,6 +483,7 @@
         if (content && content.length > 0) {
           this.selectedRowKeysRecord.push({
             standId: content[0].id,
+            title_en:content[0].title_en,
             serialNumber: content[0].serial_number,
             title: content[0].title,
             technologyTerritory: content[0].technology_territory_id

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -102,6 +102,7 @@
     },
     mounted() {
       this.isDisplay = false
+      document.title = this.$t('collectionOfRegulatoryOpinions')
       if (this.$route.query.isDisabled) {
         this.disabled = JSON.parse(this.$route.query.isDisabled)
       }

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -292,7 +292,7 @@
               let isTrue
               if (dataSource && dataSource.length > 0) {
                 for (let i = 0; i < dataSource.length; i++) {
-                  if (dataSource[i].status == 'haveDone' || !dataSource[i].status) {
+                  if (dataSource[i].status == 'haveDone' || dataSource[i].createUser) {
                     isTrue = true
                   } else {
                     isTrue = false

jero-web/src/views/processCenter/processList/index.vue

@@ -54,7 +54,9 @@
       }
     },
     mounted() {
-
+      this.$router.push({
+         path:'/projectRegulationTasks',
+      })
     },
     methods: {
       callback(key) {