Merge branch 'invest-dev' of http://git.dgtis.com/15896567520/RuoYi-flowable-master into invest-dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TStudyInformationController.java

@@ -79,7 +79,7 @@ public class TStudyInformationController extends BaseController
     {
         List<TStudyInformation> list = tStudyInformationService.selectTStudyInformationList(tStudyInformation)
                 .stream().map(n -> {
-                    n.setContractType(dictDataService.selectDictLabel("CONTRACT_TYPE",n.getContractType()));
+                    n.setContractType(dictDataService.selectDictLabel("file_type",n.getContractType()));
                     return n;
                 })
                 .collect(Collectors.toList());

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

@@ -93,6 +93,11 @@ public @interface Excel
      */
     public boolean needMerge() default false;
 
+    /**
+     * 是否需要自动换行
+     */
+    public boolean warpText() default false;
+
     /**
      * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
      */

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -1035,7 +1035,8 @@ public class ExcelUtil<T>
                     sheet.addMergedRegion(cellAddress);
                 }
                 cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor())));
-
+                //设置自动换行动态
+                cell.getCellStyle().setWrapText(attr.warpText());
                 // 用于读取对象中的属性
                 Object value = getTargetValue(vo, field, attr);
                 String dateFormat = attr.dateFormat();

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectMeeting.java

@@ -61,7 +61,7 @@ public class TProjectMeeting extends BaseEntity
     private String promoterId;
 
     /** 会议参与人 */
-    @Excel(name = "会议参与人")
+    @Excel(name = "会议参与人",warpText = true)
     private String participants;
 
     /** 会议参与人ID */

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectRecord.java

@@ -55,7 +55,7 @@ public class TProjectRecord extends BaseEntity
 
     /** 跟进内容 */
     @ApiModelProperty("跟进内容")
-    @Excel(name = "跟进内容")
+    @Excel(name = "跟进内容",warpText = true)
     private String upContent;
 
     /** 备注 */