解决冲突问题

projects-service/src/main/java/com/rtrh/projects/modules/utils/StringUtils.java → projects-service/src/main/java/com/rtrh/projects/modules/utils/MyStringUtils.java

@@ -5,7 +5,7 @@ import java.util.Objects;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 
-public class StringUtils {
+public class MyStringUtils {
 
 	/**
 	 * excel单元格转String字符串r

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -41,7 +41,7 @@ import com.rtrh.projects.modules.system.service.ISubInduService;
 import com.rtrh.projects.modules.utils.CustomCellWriteWidthStrategy;
 import com.rtrh.projects.modules.utils.DateUtils;
 import com.rtrh.projects.modules.utils.QualificationsDeclareCellWriteHandler;
-import com.rtrh.projects.modules.utils.StringUtils;
+import com.rtrh.projects.modules.utils.MyStringUtils;
 import com.rtrh.projects.outapi.result.JsonResult;
 import com.rtrh.projects.web.util.SheetData;
 import com.rtrh.projects.web.util.SheetHead;
@@ -1402,7 +1402,7 @@ public class SubInfoExportController extends BaseController {
                 List<SubInfoFixDetail> value = entry.getValue();
 
                 //我需要将key进行拼接，例如这是第1个key,前面就加一个中文一
-                String newKey = StringUtils.toChineseNumber(titleNumber++) + "、" + key + "(" + value.size() + "个)";
+                String newKey = MyStringUtils.toChineseNumber(titleNumber++) + "、" + key + "(" + value.size() + "个)";
 
                 //遍历value将id设置为从1开始的值，并计算总金额
                 BigDecimal hyflTotalAmt = BigDecimal.ZERO;
@@ -1517,7 +1517,7 @@ public class SubInfoExportController extends BaseController {
                 List<SubInfoFixCbDetail> value = entry.getValue();
 
                 //我需要将key进行拼接，例如这是第1个key,前面就加一个中文一
-                String newKey = StringUtils.toChineseNumber(titleNumber++) + "、" + key + "(" + value.size() + "个)";
+                String newKey = MyStringUtils.toChineseNumber(titleNumber++) + "、" + key + "(" + value.size() + "个)";
 
                 //遍历value将id设置为从1开始的值，并计算总金额
                 BigDecimal hyflTotalAmt = BigDecimal.ZERO;
@@ -1615,7 +1615,7 @@ public class SubInfoExportController extends BaseController {
                 List<SubInfoFixZjDetail> value = entry.getValue();
 
                 //我需要将key进行拼接，例如这是第1个key,前面就加一个中文一
-                String newKey = StringUtils.toChineseNumber(titleNumber++) + "、" + key + "(" + value.size() + "个)";
+                String newKey = MyStringUtils.toChineseNumber(titleNumber++) + "、" + key + "(" + value.size() + "个)";
 
                 //遍历value将id设置为从1开始的值，并计算总金额
                 BigDecimal hyflTotalAmt = BigDecimal.ZERO;
@@ -1726,7 +1726,7 @@ public class SubInfoExportController extends BaseController {
                 List<SubInfoFixTcDetail> value = entry.getValue();
 
                 //我需要将key进行拼接，例如这是第1个key,前面就加一个中文一
-                String newKey = StringUtils.toChineseNumber(titleNumber++) + "、" + key + "(" + value.size() + "个)";
+                String newKey = MyStringUtils.toChineseNumber(titleNumber++) + "、" + key + "(" + value.size() + "个)";
 
                 //遍历value将id设置为从1开始的值，并计算总金额
                 for (int i = 0; i < value.size(); i++) {