From f7090a3271fafbf5c3b0435697a985055aaa94a7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 30 八月 2024 12:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java |  262 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 250 insertions(+), 12 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
index 76e4cc3..b8a46a6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
@@ -1,24 +1,37 @@
 package com.vci.web.service.impl;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
 import com.vci.bo.ItemSeniorQueryBO;
 import com.vci.common.utility.ObjectUtility;
 import com.vci.corba.common.PLException;
+import com.vci.corba.omd.qtm.QTD;
+import com.vci.corba.omd.qtm.QTInfo;
 import com.vci.corba.portal.PortalService.GetPagePortalVIArrayByPageInfoResult;
 import com.vci.corba.portal.data.PortalVI;
 import com.vci.dto.*;
 import com.vci.model.*;
 import com.vci.pagemodel.*;
+import com.vci.starter.poi.bo.WriteExcelData;
+import com.vci.starter.poi.bo.WriteExcelOption;
+import com.vci.starter.poi.util.ExcelUtil;
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.BaseQueryObject;
 import com.vci.starter.web.pagemodel.BaseResult;
 import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.util.LocalFileUtil;
 import com.vci.starter.web.util.VciBaseUtil;
+import com.vci.starter.word.bo.WordMergeStartTableDataBO;
+import com.vci.starter.word.util.WordUtil;
 import com.vci.web.enumpck.ItemTypeEnum;
 import com.vci.web.enumpck.PortalVIType;
 import com.vci.web.enumpck.PortalVITypeFlag;
+import com.vci.web.service.OsAttributeServiceI;
 import com.vci.web.service.OsPortalVIServiceI;
+import com.vci.web.service.OsQuereyTemplateServiceI;
 import com.vci.web.util.PlatformClientUtil;
 import com.vci.web.util.UITools;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +40,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.io.*;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /*
@@ -48,13 +63,22 @@
     @Autowired(required = false)
     @Lazy
     private OsPortalVIServiceI self;
-
+    /**
+     * 鍔犺浇鑷韩
+     */
+    @Autowired(required = false)
+   private OsAttributeServiceI osAttributeService;
     /**
      * 骞冲彴鐨勮皟鐢ㄥ伐鍏风被
      */
     @Autowired
     private PlatformClientUtil platformClientUtil;
 
+    /**
+     * 鏌ヨ妯℃澘鏈嶅姟
+     */
+    @Autowired
+    private OsQuereyTemplateServiceI quereyTemplateServiceI;
     @Override
     public void clearCache() {
 
@@ -131,7 +155,7 @@
      */
     @Override
     public PortalVIVO getPortalVIById(String id,String viType) throws PLException {
-        VciBaseUtil.alertNotNull(id,"涓婚敭涓虹┖锛�");
+        VciBaseUtil.alertNotNull(id,"涓婚敭");
         String lableName=PortalVIType.Form.getLabel();
         if(PortalVIType.Table.getName()==viType){
             lableName=PortalVIType.Table.getLabel();
@@ -156,7 +180,8 @@
     @Override
     public boolean delete(DeletePortalVIDTOList portalVIDTOList) throws PLException {
         if(portalVIDTOList==null||CollectionUtils.isEmpty(portalVIDTOList.getPortalVIDTOList())){
-            VciBaseUtil.alertNotNull("璇烽�夋嫨瑕佸垹闄ょ殑瀵硅薄!");
+          //  VciBaseUtil.alertNotNull("鍒犻櫎鐨勫璞�");
+            throw new PLException("1001",new String[]{"璇烽�夋嫨瑕佸垹闄ょ殑瀵硅薄锛亇"});
         }
         try {
             for(PortalVIDTO portalVIDTO:portalVIDTOList.getPortalVIDTOList()) {
@@ -218,13 +243,24 @@
             throw  new VciBaseException("璇烽�夋嫨瑕佸厠闅嗙殑瀵硅薄!");
         }
         try {
+           String typeName=clonePortalVIDTOList.getClonePortalVIDTOList().get(0).getTypeName();
+            PortalVI[] portalVIS=  platformClientUtil.getPortalService().getPortalVIArrayByTypeName(typeName);
+            Map<String, PortalVIVO> PortalVIMap=new HashMap<>();
+            if(!CollectionUtils.isEmpty(Arrays.asList(portalVIS))) {
+                List<PortalVIVO> portalVIVOS = portalVIDOO2VOS(Arrays.asList(portalVIS));
+                PortalVIMap =portalVIVOS.stream().collect(Collectors.toMap(PortalVIVO::getViName, Function.identity()));
+            }
+            List<PortalVI> portalVIList=new ArrayList<>();
             for (ClonePortalVIDTO clonedestObject : clonePortalVIDTOList.getClonePortalVIDTOList()) {
                 String viName = clonedestObject.getViName();
                 PortalVIDTO portalVIDTO = clonedestObject.getOldPortalVIDTO();
-                String typeName = clonedestObject.getTypeName();
                 short typeFlag = clonedestObject.getTypeFlag();
                 if (viName != null) {
                     VciBaseUtil.alertNotNull(viName, "鍏嬮殕鍚嶇О涓嶅厑璁镐负绌�");
+                    //throw new PLException("1001",new String[]{"璇烽�夋嫨瑕佸垹闄ょ殑瀵硅薄锛亇"});
+                    if(  PortalVIMap.containsKey(viName)){
+                        throw  new VciBaseException("鍏嬮殕鍚嶇О"+viName+"宸插瓨鍦紝璇锋牳瀵癸紒");
+                    }
                     PortalVI portalVI = UITools.getService().getPortalVIById(portalVIDTO.getId());
                     portalVI.id = ObjectUtility.getNewObjectID36();
                     portalVI.viName = viName;
@@ -235,7 +271,8 @@
                     if (typeFlag == PortalVITypeFlag.BtmType.getIntVal() || typeFlag == PortalVITypeFlag.LinkType.getIntVal()) {
                         portalVI.typeFlag = typeFlag;
                     }
-                    UITools.getService().savePortalVI(portalVI);
+                    platformClientUtil.getPortalService().savePortalVI(portalVI);
+                    portalVIList.add(portalVI);
                 }
             }
         }catch (PLException e){
@@ -244,7 +281,192 @@
         return true;
     }
 
+    @Override
+    public String exportToExcel(Collection<String> idList) {
+        String defaultTempFolder = LocalFileUtil.getDefaultTempFolder();
+        String xfileName="export.xls";
+        List<WriteExcelData> rowDataList = new ArrayList<>();
+        List<WriteExcelData> qtRowDataList = new ArrayList<>();
+        //VciBaseUtil.alertNotNull(idList);
+        List<PortalVIDTO>  portalVIDTOList= listByIds(idList);
+        final int index=0;
 
+        String excelFileName = defaultTempFolder + File.separator + xfileName;
+        File excelFile = new File(excelFileName);
+        try {
+            excelFile.createNewFile();
+        }catch (Throwable e){
+            String msg = "鍦ㄥ垱寤篹xcel鏂囦欢鐨勬椂鍊欏嚭鐜颁簡閿欒";
+            if(logger.isErrorEnabled()){
+                logger.error(msg,e);
+            }
+            throw new VciBaseException(msg+",{0}",new String[]{excelFileName},e);
+        }
+
+
+        rowDataList.add(new WriteExcelData(index, 0, "涓氬姟绫诲瀷鍚嶇О"));
+        rowDataList.add(new WriteExcelData(index, 1, "鍚嶇О"));
+        rowDataList.add(new WriteExcelData(index, 2, "涓氬姟绫诲瀷"));
+        rowDataList.add(new WriteExcelData(index, 3, "琛ㄥ崟绫诲瀷"));
+        rowDataList.add(new WriteExcelData(index, 4, "閰嶇疆鏂囨湰"));
+        rowDataList.add(new WriteExcelData(index, 5, "灞炴��"));
+        rowDataList.add(new WriteExcelData(index, 6, "鏌ヨ妯℃澘鍚嶇О"));
+        rowDataList.add(new WriteExcelData(index, 7, "鏌ヨ妯℃澘閰嶇疆鏂囨湰"));
+        rowDataList.add(new WriteExcelData(index, 8, "鏌ヨ妯℃澘涓氬姟绫诲瀷"));
+
+
+        qtRowDataList.add(new WriteExcelData(index, 0, "涓氬姟绫诲瀷鍚嶇О"));
+        qtRowDataList.add(new WriteExcelData(index, 1, "閾炬帴绫诲瀷鍚嶇О"));
+        qtRowDataList.add(new WriteExcelData(index, 2, "鏌ヨ妯℃澘瀹氫箟鍚嶇О"));
+        qtRowDataList.add(new WriteExcelData(index, 3, "灞炴��"));
+
+        if(!CollectionUtils.isEmpty(portalVIDTOList)){
+            final int[] rowIndex = {1};
+            boolean isLink=PortalVITypeFlag.LinkType.getIntVal()== portalVIDTOList.get(0).getTypeFlag()?true:false;
+            try {
+                BaseResult baseResult=  quereyTemplateServiceI.queryTemplateList( portalVIDTOList.get(0).getTypeName(),isLink);
+                if(baseResult.isSuccess()){
+                    final int[] rowIndex1 = {1};
+                    Collection< QTD> qtdList=  baseResult.getData();
+                    if(!CollectionUtils.isEmpty(qtdList)){
+                        qtdList.stream().forEach(qtd -> {
+                            qtRowDataList.add(new WriteExcelData(rowIndex1[0], 0, qtd.btmName));
+                            qtRowDataList.add(new WriteExcelData(rowIndex1[0], 1, qtd.linkTypeName));
+                            qtRowDataList.add(new WriteExcelData(rowIndex1[0], 2, qtd.name));
+                            qtRowDataList.add(new WriteExcelData(rowIndex1[0], 3, VciBaseUtil.array2String(qtd.abNames)));
+                            rowIndex1[0]++;
+                        });
+
+                    }
+                }
+            } catch (PLException e) {
+                e.printStackTrace();
+            }
+            portalVIDTOList.stream().forEach(portalVIDTO -> {
+                //鍏堟槸鍚嶇О
+                rowDataList.add(new WriteExcelData(rowIndex[0], 0, portalVIDTO.getTypeName()));//涓氬姟绫诲瀷鍚嶇О
+                rowDataList.add(new WriteExcelData(rowIndex[0], 1, portalVIDTO.getViName()));//鍚嶇О
+                rowDataList.add(new WriteExcelData(rowIndex[0], 2, PortalVITypeFlag.getByIntVal(portalVIDTO.getTypeFlag()).getLabel()));//涓氬姟绫诲瀷
+                rowDataList.add(new WriteExcelData(rowIndex[0], 3,PortalVIType.getByIntVal(portalVIDTO.getViType()).getLabel()));//琛ㄥ崟绫诲瀷
+                try {
+                    String prmText=UITools.getPRMText(prmDOO2VIS(portalVIDTO.getPrm(),portalVIDTO.getViType()));
+                    String prmTextFileName=	ObjectUtility.getNewObjectID36() + ".txt";
+                    String prmTextFileNameAllName = xfileName + "." + prmTextFileName;
+                    writeDataToFile(defaultTempFolder,prmTextFileNameAllName,prmText);
+                    rowDataList.add(new WriteExcelData(rowIndex[0], 4,prmTextFileName));//閰嶇疆鏂囨湰
+
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+                String attributeStr="";
+                try {
+                    List<OsAttributeVO> osAttributeVOList=osAttributeService.getOsAttributeVOSByBtName(portalVIDTO.getTypeName(),portalVIDTO.getTypeFlag());
+                    if(!CollectionUtils.isEmpty(osAttributeVOList)){
+                      List<String> filedList= osAttributeVOList.stream().map(OsAttributeVO::getId).collect(Collectors.toList());
+                        attributeStr=VciBaseUtil.array2String(filedList.toArray(new String[]{}));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                rowDataList.add(new WriteExcelData(rowIndex[0], 5, attributeStr));//灞炴��
+              String qtName="";
+                try {
+                    QTInfo qt = platformClientUtil.getQTDService().getQT(portalVIDTO.getPrm().getFormQtName());
+                    qtName=qt.qtName;
+                    rowDataList.add(new WriteExcelData(rowIndex[0], 6,qtName));//鏌ヨ妯℃澘鍚嶇О
+                    String qtFileName = ObjectUtility.getNewObjectID36() + ".txt";
+                    String qtFileNameAllName = xfileName + "." + qtFileName;
+                    writeDataToFile(defaultTempFolder,qtFileNameAllName,qt.qtText);
+                    rowDataList.add(new WriteExcelData(rowIndex[0], 7, qtFileName));//鏌ヨ妯℃澘閰嶇疆鏂囨湰
+                    rowDataList.add(new WriteExcelData(rowIndex[0], 8, qt.btmName));//鏌ヨ妯℃澘涓氬姟绫诲瀷
+                } catch (PLException e) {
+                    e.printStackTrace();
+                }
+
+                rowIndex[0]++;
+            });
+        }
+
+
+       /* String excelTemplateFileName = "/excelTemplate/dataBaseExport.xls";
+        if(this.getClass().getResource(excelTemplateFileName) == null){
+            throw new VciBaseException("璇疯仈绯荤鐞嗗憳锛岀郴缁熶腑缂哄皯{0}杩欎釜妯℃澘鏂囦欢",new String[]{excelTemplateFileName});
+        }
+        try {
+            ExcelUtil.copyFileFromJar(excelTemplateFileName,excelFile);
+            //杩欎釜鏂规硶浼氬叧闂枃浠舵祦
+        }catch (Throwable e){
+            String msg = "浠庢ā鏉挎枃浠舵嫹璐濆埌鐩爣鏂囦欢鍑虹幇浜嗛敊璇�";
+            if(logger.isErrorEnabled()){
+                logger.error(msg,e);
+            }
+            throw new VciBaseException(msg+",{0}",new String[]{excelFileName},e);
+        }*/
+        try{
+            WriteExcelOption excelOption = new WriteExcelOption();
+            excelOption.addSheetDataList("portalvi",rowDataList);
+            excelOption.addSheetDataList("QTD",qtRowDataList);
+            ExcelUtil.writeDataToFile(excelFile,excelOption);
+        }catch (Throwable e){
+            String msg = "鎶婃暟鎹啓鍏ュ埌excel鏂囦欢涓嚭鐜伴敊璇�";
+            if(logger.isErrorEnabled()){
+                logger.error(msg,e);
+            }
+            throw new VciBaseException(msg+",{0}",new String[]{excelFileName},e);
+        }
+        File zip = ZipUtil.zip(defaultTempFolder);
+        FileUtil.del(defaultTempFolder + File.separator);
+        //鏈�鍚庤繑鍥瀍xcel鏂囦欢鍚嶇О
+        return zip.getAbsoluteFile().getAbsolutePath();
+    }
+
+    /**
+     * 鎷疯礉鏁版嵁鍒皐ord妯℃澘涓�
+     * @param fileName 瑕佸啓鍏ョ殑鏁版嵁
+     * @return word 鏂囦欢璺緞
+     */
+    public String writeDataToFile(String defaultTempFolder,String fileName,String str){
+        String tempFolder = LocalFileUtil.getDefaultTempFolder();
+        //鎷疯礉鏂囦欢
+        String filePath = tempFolder + File.separator + fileName;
+        File file = new File(filePath);
+        FileOutputStream out = null;
+        try {
+            file.createNewFile();
+            out=  new FileOutputStream(file);
+            IOUtils.write(str,out);
+        }catch (Throwable e){
+            IOUtils.closeQuietly(out);
+            String msg = "鍦ㄥ垱寤烘枃浠剁殑鏃跺�欏嚭鐜颁簡閿欒";
+            if(logger.isErrorEnabled()){
+                logger.error(msg,e);
+            }
+            throw new VciBaseException(msg+",{0}",new String[]{filePath},e);
+        }finally {
+            IOUtils.closeQuietly(out);
+            //绉诲姩灞炴�у埌閾炬帴绫诲瀷鏂囦欢澶归噷闈㈠幓
+            FileUtil.move(file, new File(defaultTempFolder),true);
+            FileUtil.del(tempFolder);
+        }
+        return filePath;
+    }
+    public List<PortalVIDTO> listByIds(Collection idList){
+        List<PortalVIDTO> portalVIVOList=new ArrayList<>();
+        if(CollectionUtils.isEmpty(idList)){
+            throw  new VciBaseException("璇烽�夋嫨闇�瑕佸鍑虹殑鏁版嵁");
+        }
+        List<PortalVI> portalVIList=new ArrayList<>();
+        idList.stream().forEach(id->{
+            try {
+                PortalVI portalVI=  platformClientUtil.getPortalService().getPortalVIById(id.toString());
+                portalVIList.add(portalVI);
+            } catch (PLException e) {
+                e.printStackTrace();
+            }
+        });
+        portalVIVOList=  portalVIO2DTOS(portalVIList);
+        return portalVIVOList;
+    }
     private BaseResult savePortalVIDTO(PortalVIDTO portalVIDTO,boolean isEdit)  {
 
         boolean _isBtm=false;
@@ -486,10 +708,13 @@
     public  PortalVIVO portalVIDOO2VO(PortalVI portalVI) {
         PortalVIVO portalVIVO=new PortalVIVO();
         portalVIVO.setId(portalVI.id);
+        portalVIVO.setTypeFlagText(PortalVITypeFlag.getByIntVal(portalVI.typeFlag).getLabel());
         portalVIVO.setTypeFlag(portalVI.typeFlag);
         portalVIVO.setTypeName(portalVI.typeName);
         portalVIVO.setViName(portalVI.viName);
         portalVIVO.setViType(portalVI.viType);
+        portalVIVO.setViTypeText(PortalVIType.getByIntVal(portalVI.viType).getLabel());
+
         String  prm= portalVI.prm;
         if(StringUtils.isNotBlank(prm)) {
             PRMDO prmdo = UITools.getPRM(prm);
@@ -742,7 +967,13 @@
         List<String> itemSelectoutFieldList= allKeyList.stream().filter(s ->!itemOutFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
         prmItemVO.setItemSelectoutFieldList(itemSelectoutFieldList);//寰呴�夋嫨鐨勫睘鎬у瓧娈�
         prmItemVO.setItemOutFieldList(itemOutFieldList);//闇�瑕佷娇鐢ㄧ殑闆嗗悎
-        List<String> itemSearchFieldList= itemOutFieldList.stream().filter(s ->!itemKeyFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
+      //  List<String> itemSearchFieldList= itemOutFieldList.stream().filter(s ->!CollectionUtils.isEmpty(itemKeyFieldList).stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
+        List<String> itemSearchFieldList=new ArrayList<>();
+        if(!CollectionUtils.isEmpty(itemKeyFieldList)){
+            itemSearchFieldList= itemOutFieldList.stream().filter(s ->!itemKeyFieldList.contains(s)).collect(Collectors.toList());
+        }else{
+            itemSearchFieldList=itemOutFieldList;
+        }
         prmItemVO.setItemSearchFieldList(itemSearchFieldList);//寰呮悳绱㈠瓧娈�
         prmItemVO.setItemKeyFieldList(itemKeyFieldList);//鎼滅储瀛楁
     }
@@ -760,8 +991,12 @@
         List<String> itemSelectoutFieldList= allKeyList.stream().filter(s ->!itemOutFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
         prmItemDTO.setItemSelectoutFieldList(itemSelectoutFieldList);//寰呴�夋嫨鐨勫睘鎬у瓧娈�
         prmItemDTO.setItemOutFieldList(itemOutFieldList);//闇�瑕佷娇鐢ㄧ殑闆嗗悎
-        List<String> itemSearchFieldList= itemOutFieldList.stream().filter(s ->!itemKeyFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
-        prmItemDTO.setItemSearchFieldList(itemSearchFieldList);//寰呮悳绱㈠瓧娈�
+        List<String> itemSearchFieldList=new ArrayList<>();
+        if(!CollectionUtils.isEmpty(itemKeyFieldList)){
+            itemSearchFieldList= itemOutFieldList.stream().filter(s ->!itemKeyFieldList.contains(s)).collect(Collectors.toList());
+        }else{
+            itemSearchFieldList=itemOutFieldList;
+        } prmItemDTO.setItemSearchFieldList(itemSearchFieldList);//寰呮悳绱㈠瓧娈�
         prmItemDTO.setItemKeyFieldList(itemKeyFieldList);//鎼滅储瀛楁
     }
     /**
@@ -772,7 +1007,7 @@
     private void initTableConfigDTOO2DOData(PRMItemDO prmItemDO,PRMItemDTO prmItemDTO){
 
         prmItemDO.setItemOutFields(VciBaseUtil.array2String(prmItemDTO.getItemOutFieldList().toArray(new String[]{})));//闇�瑕佷娇鐢ㄧ殑瀛楁
-        prmItemDO.setItemKeyFields(VciBaseUtil.array2String(prmItemDTO.getItemKeyFieldList().toArray(new String[]{})));//闇�瑕佹悳绱㈢殑瀛楁
+        prmItemDO.setItemKeyFields(CollectionUtils.isEmpty(prmItemDTO.getItemKeyFieldList())?"":VciBaseUtil.array2String(prmItemDTO.getItemKeyFieldList().toArray(new String[]{})));//闇�瑕佹悳绱㈢殑瀛楁
        List<String> newItemFieldWidthList=prmItemDTO.getItemFieldWidthList().stream().map(KeyValue::getValue).distinct().collect(Collectors.toList());
        prmItemDO.setItemFieldWidth(VciBaseUtil.array2String(newItemFieldWidthList.toArray(new String[]{}),":"));//瀛楁瀹藉害
        List<ItemSeniorQueryBO> itemSeniorQueryBOS=  prmItemDTO.getItemSeniorQueryBOS();
@@ -805,11 +1040,14 @@
     private List<KeyValue>  initItemFieldWidthList(String itemOutFields,String itemFieldWidth){
         List<KeyValue> keyValueList=new ArrayList<>();
         List<String>itemOutFieldList=   VciBaseUtil.str2List(itemOutFields);
-        List<String>itemFieldWidthList=  VciBaseUtil.str2List(itemFieldWidth);
+        List<String>itemFieldWidthList=  VciBaseUtil.str2List(itemFieldWidth,",");
         if(itemOutFieldList.size()>0) {
             for (int i = 0; i < itemOutFieldList.size(); i++) {
                 KeyValue keyValue = new KeyValue();
-                String with = itemFieldWidthList.get(i);
+                String with="250";
+                if(i<itemFieldWidthList.size()) {
+                    with  = itemFieldWidthList.get(i);
+               }
                 keyValue.setKey(itemOutFieldList.get(i));
                 keyValue.setValue(StringUtils.isBlank(with) ? "250" : with);
                 keyValueList.add(keyValue);

--
Gitblit v1.9.3